Disable upgrades

mconcas · mconcas · commit c069e43786b4 · 2020-06-12T13:25:55.000+02:00
diff --git a/DataFormats/Headers/include/Headers/DataHeader.h b/DataFormats/Headers/include/Headers/DataHeader.h
@@ -42,8 +42,6 @@
 #include "MemoryResources/Types.h"
 #include <cerrno>
 
-#define ENABLE_UPGRADES
-
 namespace o2
 {
 namespace header
diff --git a/Detectors/Base/src/GeometryManager.cxx b/Detectors/Base/src/GeometryManager.cxx
@@ -51,6 +51,7 @@ Bool_t GeometryManager::getOriginalMatrix(const char* symname, TGeoHMatrix& m)
 
   if (!gGeoManager || !gGeoManager->IsClosed()) {
     LOG(ERROR) << "No active geometry or geometry not yet closed!";
+    ;
     return kFALSE;
   }
 
diff --git a/Steer/include/Steer/O2MCApplication.h b/Steer/include/Steer/O2MCApplication.h
@@ -85,7 +85,6 @@ class O2MCApplication : public O2MCApplicationBase
 
     LOG(INFO) << "Generate primaries " << mPrimaries.size() << "\n";
     GetStack()->Reset();
-
     // but here we init the stack from
     // a vector of particles that someone sets externally
     static_cast<o2::data::Stack*>(GetStack())->initFromPrimaries(mPrimaries);
diff --git a/Steer/src/O2MCApplication.cxx b/Steer/src/O2MCApplication.cxx
@@ -86,6 +86,7 @@ void O2MCApplicationBase::ConstructGeometry()
       mModIdToName[mod->GetModId()] = mod->GetName();
     }
   }
+
   FairMCApplication::ConstructGeometry();
 
   std::ofstream voltomodulefile("MCStepLoggerVolMap.dat");
diff --git a/cmake/O2DefineOptions.cmake b/cmake/O2DefineOptions.cmake
@@ -28,5 +28,5 @@ function(o2_define_options)
   # for the complete picture of how BUILD_SIMULATION is handled see
   # ../dependencies/O2SimulationDependencies.cmake
 
-  option(ENABLE_UPGRADES "Enable detectors for upgrades" ON)
+  option(ENABLE_UPGRADES "Enable detectors for upgrades" OFF)
 endfunction()
diff --git a/run/CMakeLists.txt b/run/CMakeLists.txt
@@ -13,6 +13,7 @@
 add_library(allsim INTERFACE)
 
 if(ENABLE_UPGRADES)
+target_compile_definitions(allsim INTERFACE ENABLE_UPGRADES)
 target_link_libraries(allsim
                       INTERFACE O2::SimConfig
                                 O2::Steer
diff --git a/run/O2HitMerger.h b/run/O2HitMerger.h
@@ -747,7 +747,7 @@ void O2HitMerger::initDetInstances()
     initHitTreeAndOutFile(i);
   }
   if (counter != DetID::nDetectors) {
-    LOG(WARNING) << " O2HitMerger: Some Detectors are potentially missing in this initialization " << counter;
+    LOG(WARNING) << " O2HitMerger: Some Detectors are potentially missing in this initialization ";
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@`
`42`	`42`	`#include "MemoryResources/Types.h"`
`43`	`43`	`#include <cerrno>`
`44`	`44`
`45`		`-#define ENABLE_UPGRADES`
`46`		`-`
`47`	`45`	`namespace o2`
`48`	`46`	`{`
`49`	`47`	`namespace header`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ Bool_t GeometryManager::getOriginalMatrix(const char* symname, TGeoHMatrix& m)`
`51`	`51`
`52`	`52`	`if (!gGeoManager \|\| !gGeoManager->IsClosed()) {`
`53`	`53`	`LOG(ERROR) << "No active geometry or geometry not yet closed!";`
	`54`	`+ ;`
`54`	`55`	`return kFALSE;`
`55`	`56`	`}`
`56`	`57`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ void O2MCApplicationBase::ConstructGeometry()`
`86`	`86`	`mModIdToName[mod->GetModId()] = mod->GetName();`
`87`	`87`	`}`
`88`	`88`	`}`
	`89`	`+`
`89`	`90`	`FairMCApplication::ConstructGeometry();`
`90`	`91`
`91`	`92`	`std::ofstream voltomodulefile("MCStepLoggerVolMap.dat");`
Original file line number	Diff line number	Diff line change
`@@ -747,7 +747,7 @@ void O2HitMerger::initDetInstances()`
`747`	`747`	`initHitTreeAndOutFile(i);`
`748`	`748`	`}`
`749`	`749`	`if (counter != DetID::nDetectors) {`
`750`		`- LOG(WARNING) << " O2HitMerger: Some Detectors are potentially missing in this initialization " << counter;`
	`750`	`+ LOG(WARNING) << " O2HitMerger: Some Detectors are potentially missing in this initialization ";`
`751`	`751`	`}`
`752`	`752`	`}`
`753`	`753`