Simcuts for passive volumes

sawenzel · sawenzel · commit a5eaf48aaa50 · 2020-03-03T18:35:41.000+01:00
diff --git a/Detectors/Passive/CMakeLists.txt b/Detectors/Passive/CMakeLists.txt
@@ -20,6 +20,7 @@ o2_add_library(DetectorsPassive
                        src/Shil.cxx
                        src/Hall.cxx
                        src/HallSimParam.cxx
+                       src/PassiveBase.cxx
                PUBLIC_LINK_LIBRARIES O2::Field O2::DetectorsBase O2::SimConfig)
 
 o2_target_root_dictionary(DetectorsPassive
@@ -34,9 +35,12 @@ o2_target_root_dictionary(DetectorsPassive
                                   include/DetectorsPassive/Shil.h
                                   include/DetectorsPassive/Hall.h
                                   include/DetectorsPassive/HallSimParam.h
+                                  include/DetectorsPassive/PassiveBase.h
                           LINKDEF src/PassiveLinkDef.h)
 
 # FIXME: if PutFrameInTop really depends on TRD, then the following can not work
 # as TRD is built afterwards. So we have a dependency problem here potentially.
 # o2_add_test_root_macro(FILENAME "macro/PutFrameInTop.C" PUBLIC_LINK_LIBRARIES
 # DetectorsPassive FairRoot::Base TRDSimulation)
+
+o2_data_file(COPY data DESTINATION Detectors/Passive/simulation)
diff --git a/Detectors/Passive/data/simcuts_Frame.dat b/Detectors/Passive/data/simcuts_Frame.dat
@@ -0,0 +1,10 @@
+* Space Frame
+* ===========
+*    Med GAM  ELEC  NHAD  CHAD  MUON  EBREM MUHAB EDEL  MUDEL MUPA  ANNI  BREM  COMP  DCAY  DRAY  HADR  LOSS  MULS  PAIR  PHOT  RAYL  STRA
+* Air
+* ^^^
+FRAME 5 5.e-5 5.e-5 5.e-5 5.e-5 1.e-3 1.e-3 1.e-3
+
+* Steel
+* ^^^^^
+FRAME 65 5.e-5 5.e-5 5.e-5 5.e-5 1.e-3 1.e-3 1.e-3
diff --git a/Detectors/Passive/include/DetectorsPassive/Absorber.h b/Detectors/Passive/include/DetectorsPassive/Absorber.h
@@ -11,13 +11,13 @@
 #ifndef ALICEO2_PASSIVE_ABSORBER_H
 #define ALICEO2_PASSIVE_ABSORBER_H
 
-#include "FairModule.h" // for FairModule
+#include "DetectorsPassive/PassiveBase.h"
 
 namespace o2
 {
 namespace passive
 {
-class Absorber : public FairModule
+class Absorber : public PassiveBase
 {
  public:
   Absorber(const char* name, const char* Title = "ALICE Absorber");
diff --git a/Detectors/Passive/include/DetectorsPassive/Compensator.h b/Detectors/Passive/include/DetectorsPassive/Compensator.h
@@ -11,15 +11,15 @@
 #ifndef ALICEO2_PASSIVE_COMPENSATOR_H
 #define ALICEO2_PASSIVE_COMPENSATOR_H
 
-#include "FairModule.h"
+#include "DetectorsPassive/PassiveBase.h"
 #include "Rtypes.h"
 
 namespace o2
 {
 namespace passive
 {
 // The dipole compensator on the A side
-class Compensator : public FairModule
+class Compensator : public PassiveBase
 {
  public:
   Compensator(const char* name, const char* Title = "ALICE Compensator");
diff --git a/Detectors/Passive/include/DetectorsPassive/Dipole.h b/Detectors/Passive/include/DetectorsPassive/Dipole.h
@@ -11,14 +11,14 @@
 #ifndef ALICEO2_PASSIVE_DIPOLE_H
 #define ALICEO2_PASSIVE_DIPOLE_H
 
-#include "FairModule.h"
+#include "DetectorsPassive/PassiveBase.h"
 #include "Rtypes.h"
 
 namespace o2
 {
 namespace passive
 {
-class Dipole : public FairModule
+class Dipole : public PassiveBase
 {
  public:
   Dipole(const char* name, const char* Title = "ALICE Dipole");
diff --git a/Detectors/Passive/include/DetectorsPassive/FrameStructure.h b/Detectors/Passive/include/DetectorsPassive/FrameStructure.h
@@ -17,7 +17,7 @@
 #ifndef O2_PASSIVE_FRAMESTRUCTURE_H
 #define O2_PASSIVE_FRAMESTRUCTURE_H
 
-#include <FairModule.h>
+#include "DetectorsPassive/PassiveBase.h"
 
 class TGeoCompositeShape;
 
@@ -26,7 +26,7 @@ namespace o2
 namespace passive
 {
 // class supposed to provide the frame support structure common to TOF and TRD
-class FrameStructure : public FairModule
+class FrameStructure : public PassiveBase
 {
  public:
   FrameStructure(const char* name, const char* title = "FrameStruct");
diff --git a/Detectors/Passive/include/DetectorsPassive/Magnet.h b/Detectors/Passive/include/DetectorsPassive/Magnet.h
@@ -24,14 +24,14 @@
 #ifndef ALICEO2_PASSIVE_MAGNET_H
 #define ALICEO2_PASSIVE_MAGNET_H
 
-#include "FairModule.h" // for FairModule
+#include "DetectorsPassive/PassiveBase.h"
 #include "Rtypes.h"     // for Magnet::Class, Bool_t, etc
 
 namespace o2
 {
 namespace passive
 {
-class Magnet : public FairModule
+class Magnet : public PassiveBase
 {
  public:
   Magnet(const char* name, const char* Title = "ALICE Magnet");
diff --git a/Detectors/Passive/include/DetectorsPassive/PassiveBase.h b/Detectors/Passive/include/DetectorsPassive/PassiveBase.h
@@ -0,0 +1,34 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#ifndef ALICEO2_PASSIVE_BASE_H
+#define ALICEO2_PASSIVE_BASE_H
+
+#include "FairModule.h" // for FairModule
+
+namespace o2
+{
+namespace passive
+{
+
+/// a common base class for passive modules - implementing generic functions
+class PassiveBase : public FairModule
+{
+ public:
+  using FairModule::FairModule;
+  void SetSpecialPhysicsCuts() override;
+
+  ClassDefOverride(o2::passive::PassiveBase, 1);
+};
+
+} // namespace passive
+} // namespace o2
+
+#endif
diff --git a/Detectors/Passive/include/DetectorsPassive/Pipe.h b/Detectors/Passive/include/DetectorsPassive/Pipe.h
@@ -11,7 +11,7 @@
 #ifndef ALICEO2_PASSIVE_PIPE_H
 #define ALICEO2_PASSIVE_PIPE_H
 
-#include "FairModule.h" // for FairModule
+#include "DetectorsPassive/PassiveBase.h"
 #include "Rtypes.h"     // for Pipe::Class, ClassDef, Pipe::Streamer
 
 class TGeoPcon;
@@ -20,7 +20,7 @@ namespace o2
 {
 namespace passive
 {
-class Pipe : public FairModule
+class Pipe : public PassiveBase
 {
  public:
   Pipe(const char* name, const char* Title = "Alice Pipe", float rho = 0.f, float thick = 0.f);
diff --git a/Detectors/Passive/include/DetectorsPassive/Shil.h b/Detectors/Passive/include/DetectorsPassive/Shil.h
@@ -11,13 +11,13 @@
 #ifndef ALICEO2_PASSIVE_SHIL_H
 #define ALICEO2_PASSIVE_SHIL_H
 
-#include "FairModule.h" // for FairModule
+#include "DetectorsPassive/PassiveBase.h"
 
 namespace o2
 {
 namespace passive
 {
-class Shil : public FairModule
+class Shil : public PassiveBase
 {
  public:
   Shil(const char* name, const char* Title = "ALICE Shil");
diff --git a/Detectors/Passive/src/Absorber.cxx b/Detectors/Passive/src/Absorber.cxx
@@ -33,8 +33,8 @@ using namespace o2::passive;
 
 Absorber::~Absorber() = default;
 
-Absorber::Absorber() : FairModule("Absorber", "") {}
-Absorber::Absorber(const char* name, const char* Title) : FairModule(name, Title) {}
+Absorber::Absorber() : PassiveBase("Absorber", "") {}
+Absorber::Absorber(const char* name, const char* Title) : PassiveBase(name, Title) {}
 Absorber::Absorber(const Absorber& rhs) = default;
 
 Absorber& Absorber::operator=(const Absorber& rhs)
diff --git a/Detectors/Passive/src/Compensator.cxx b/Detectors/Passive/src/Compensator.cxx
@@ -29,8 +29,8 @@ using namespace o2::passive;
 
 Compensator::~Compensator() = default;
 
-Compensator::Compensator() : FairModule("Compensator", "") {}
-Compensator::Compensator(const char* name, const char* Title) : FairModule(name, Title) {}
+Compensator::Compensator() : PassiveBase("Compensator", "") {}
+Compensator::Compensator(const char* name, const char* Title) : PassiveBase(name, Title) {}
 Compensator::Compensator(const Compensator& rhs) = default;
 
 Compensator& Compensator::operator=(const Compensator& rhs)
@@ -40,7 +40,7 @@ Compensator& Compensator::operator=(const Compensator& rhs)
     return *this;
 
   // base class assignment
-  FairModule::operator=(rhs);
+  PassiveBase::operator=(rhs);
 
   return *this;
 }
diff --git a/Detectors/Passive/src/Dipole.cxx b/Detectors/Passive/src/Dipole.cxx
@@ -30,8 +30,8 @@ using namespace o2::passive;
 
 Dipole::~Dipole() = default;
 
-Dipole::Dipole() : FairModule("Dipole", "") {}
-Dipole::Dipole(const char* name, const char* Title) : FairModule(name, Title) {}
+Dipole::Dipole() : PassiveBase("Dipole", "") {}
+Dipole::Dipole(const char* name, const char* Title) : PassiveBase(name, Title) {}
 Dipole::Dipole(const Dipole& rhs) = default;
 
 Dipole& Dipole::operator=(const Dipole& rhs)
@@ -41,7 +41,7 @@ Dipole& Dipole::operator=(const Dipole& rhs)
     return *this;
 
   // base class assignment
-  FairModule::operator=(rhs);
+  PassiveBase::operator=(rhs);
 
   return *this;
 }
diff --git a/Detectors/Passive/src/FrameStructure.cxx b/Detectors/Passive/src/FrameStructure.cxx
@@ -39,11 +39,11 @@ const char* TOPNAME = "cave";
 #define kRaddeg TMath::RadToDeg()
 #define kDegrad TMath::DegToRad()
 
-FrameStructure::FrameStructure(const char* name, const char* Title) : FairModule(name, Title)
+FrameStructure::FrameStructure(const char* name, const char* Title) : PassiveBase(name, Title)
 {
 }
 
-FrameStructure::FrameStructure(const FrameStructure& rhs) : FairModule(rhs)
+FrameStructure::FrameStructure(const FrameStructure& rhs) : PassiveBase(rhs)
 {
 }
 
diff --git a/Detectors/Passive/src/Magnet.cxx b/Detectors/Passive/src/Magnet.cxx
@@ -39,8 +39,8 @@ using namespace o2::passive;
 
 Magnet::~Magnet() = default;
 
-Magnet::Magnet() : FairModule("Magnet", "") {}
-Magnet::Magnet(const char* name, const char* Title) : FairModule(name, Title) {}
+Magnet::Magnet() : PassiveBase("Magnet", "") {}
+Magnet::Magnet(const char* name, const char* Title) : PassiveBase(name, Title) {}
 Magnet::Magnet(const Magnet& rhs) = default;
 
 Magnet& Magnet::operator=(const Magnet& rhs)
@@ -50,7 +50,7 @@ Magnet& Magnet::operator=(const Magnet& rhs)
     return *this;
 
   // base class assignment
-  FairModule::operator=(rhs);
+  PassiveBase::operator=(rhs);
 
   return *this;
 }
diff --git a/Detectors/Passive/src/PassiveBase.cxx b/Detectors/Passive/src/PassiveBase.cxx
@@ -0,0 +1,35 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#include "DetectorsBase/MaterialManager.h"
+#include "DetectorsPassive/PassiveBase.h"
+
+using namespace o2::passive;
+
+void PassiveBase::SetSpecialPhysicsCuts()
+{
+  // default implementation for physics cuts setting (might still be overriden by detectors)
+  // we try to read an external text file supposed to be installed
+  // in a standard directory
+  // ${O2_ROOT}/share/Detectors/DETECTORNAME/simulation/data/simcuts.dat
+  LOG(INFO) << "Setting special cuts for passive module " << GetName();
+  const char* aliceO2env = std::getenv("O2_ROOT");
+  std::string inputFile;
+  if (aliceO2env) {
+    inputFile = std::string(aliceO2env);
+  }
+  inputFile += "/share/Detectors/Passive/simulation/data/simcuts_" + std::string(GetName()) + ".dat";
+  auto& matmgr = o2::base::MaterialManager::Instance();
+  matmgr.loadCutsAndProcessesFromFile(GetName(), inputFile.c_str());
+
+  // TODO:
+  // foresee possibility to read from local (non-installed) file or
+  // via command line
+}
diff --git a/Detectors/Passive/src/PassiveLinkDef.h b/Detectors/Passive/src/PassiveLinkDef.h
@@ -26,6 +26,7 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
+#pragma link C++ class o2::passive::PassiveBase + ;
 #pragma link C++ class o2::passive::Absorber + ;
 #pragma link C++ class o2::passive::Dipole + ;
 #pragma link C++ class o2::passive::Compensator + ;
diff --git a/Detectors/Passive/src/Pipe.cxx b/Detectors/Passive/src/Pipe.cxx
@@ -40,9 +40,9 @@
 using namespace o2::passive;
 
 Pipe::~Pipe() = default;
-Pipe::Pipe() : FairModule() {}
+Pipe::Pipe() : PassiveBase() {}
 Pipe::Pipe(const char* name, const char* title, float rho, float thick)
-  : FairModule(name, title), mBePipeRmax(rho), mBePipeThick(thick)
+  : PassiveBase(name, title), mBePipeRmax(rho), mBePipeThick(thick)
 {
 }
 Pipe::Pipe(const Pipe& rhs) = default;
@@ -54,7 +54,7 @@ Pipe& Pipe::operator=(const Pipe& rhs)
     return *this;
 
   // base class assignment
-  FairModule::operator=(rhs);
+  PassiveBase::operator=(rhs);
 
   return *this;
 }
diff --git a/Detectors/Passive/src/Shil.cxx b/Detectors/Passive/src/Shil.cxx
@@ -29,8 +29,8 @@ using namespace o2::passive;
 
 Shil::~Shil() = default;
 
-Shil::Shil() : FairModule("Shil", "") {}
-Shil::Shil(const char* name, const char* Title) : FairModule(name, Title) {}
+Shil::Shil() : PassiveBase("Shil", "") {}
+Shil::Shil(const char* name, const char* Title) : PassiveBase(name, Title) {}
 Shil::Shil(const Shil& rhs) = default;
 
 Shil& Shil::operator=(const Shil& rhs)
@@ -40,7 +40,7 @@ Shil& Shil::operator=(const Shil& rhs)
     return *this;
 
   // base class assignment
-  FairModule::operator=(rhs);
+  PassiveBase::operator=(rhs);
 
   return *this;
 }

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,13 @@`
`11`	`11`	`#ifndef ALICEO2_PASSIVE_ABSORBER_H`
`12`	`12`	`#define ALICEO2_PASSIVE_ABSORBER_H`
`13`	`13`
`14`		`-#include "FairModule.h" // for FairModule`
	`14`	`+#include "DetectorsPassive/PassiveBase.h"`
`15`	`15`
`16`	`16`	`namespace o2`
`17`	`17`	`{`
`18`	`18`	`namespace passive`
`19`	`19`	`{`
`20`		`-class Absorber : public FairModule`
	`20`	`+class Absorber : public PassiveBase`
`21`	`21`	`{`
`22`	`22`	`public:`
`23`	`23`	`Absorber(const char* name, const char* Title = "ALICE Absorber");`
Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,15 @@`
`11`	`11`	`#ifndef ALICEO2_PASSIVE_COMPENSATOR_H`
`12`	`12`	`#define ALICEO2_PASSIVE_COMPENSATOR_H`
`13`	`13`
`14`		`-#include "FairModule.h"`
	`14`	`+#include "DetectorsPassive/PassiveBase.h"`
`15`	`15`	`#include "Rtypes.h"`
`16`	`16`
`17`	`17`	`namespace o2`
`18`	`18`	`{`
`19`	`19`	`namespace passive`
`20`	`20`	`{`
`21`	`21`	`// The dipole compensator on the A side`
`22`		`-class Compensator : public FairModule`
	`22`	`+class Compensator : public PassiveBase`
`23`	`23`	`{`
`24`	`24`	`public:`
`25`	`25`	`Compensator(const char* name, const char* Title = "ALICE Compensator");`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@`
`11`	`11`	`#ifndef ALICEO2_PASSIVE_DIPOLE_H`
`12`	`12`	`#define ALICEO2_PASSIVE_DIPOLE_H`
`13`	`13`
`14`		`-#include "FairModule.h"`
	`14`	`+#include "DetectorsPassive/PassiveBase.h"`
`15`	`15`	`#include "Rtypes.h"`
`16`	`16`
`17`	`17`	`namespace o2`
`18`	`18`	`{`
`19`	`19`	`namespace passive`
`20`	`20`	`{`
`21`		`-class Dipole : public FairModule`
	`21`	`+class Dipole : public PassiveBase`
`22`	`22`	`{`
`23`	`23`	`public:`
`24`	`24`	`Dipole(const char* name, const char* Title = "ALICE Dipole");`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`#ifndef O2_PASSIVE_FRAMESTRUCTURE_H`
`18`	`18`	`#define O2_PASSIVE_FRAMESTRUCTURE_H`
`19`	`19`
`20`		`-#include <FairModule.h>`
	`20`	`+#include "DetectorsPassive/PassiveBase.h"`
`21`	`21`
`22`	`22`	`class TGeoCompositeShape;`
`23`	`23`
`@@ -26,7 +26,7 @@ namespace o2`
`26`	`26`	`namespace passive`
`27`	`27`	`{`
`28`	`28`	`// class supposed to provide the frame support structure common to TOF and TRD`
`29`		`-class FrameStructure : public FairModule`
	`29`	`+class FrameStructure : public PassiveBase`
`30`	`30`	`{`
`31`	`31`	`public:`
`32`	`32`	`FrameStructure(const char* name, const char* title = "FrameStruct");`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@`
`24`	`24`	`#ifndef ALICEO2_PASSIVE_MAGNET_H`
`25`	`25`	`#define ALICEO2_PASSIVE_MAGNET_H`
`26`	`26`
`27`		`-#include "FairModule.h" // for FairModule`
	`27`	`+#include "DetectorsPassive/PassiveBase.h"`
`28`	`28`	`#include "Rtypes.h" // for Magnet::Class, Bool_t, etc`
`29`	`29`
`30`	`30`	`namespace o2`
`31`	`31`	`{`
`32`	`32`	`namespace passive`
`33`	`33`	`{`
`34`		`-class Magnet : public FairModule`
	`34`	`+class Magnet : public PassiveBase`
`35`	`35`	`{`
`36`	`36`	`public:`
`37`	`37`	`Magnet(const char* name, const char* Title = "ALICE Magnet");`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#ifndef ALICEO2_PASSIVE_PIPE_H`
`12`	`12`	`#define ALICEO2_PASSIVE_PIPE_H`
`13`	`13`
`14`		`-#include "FairModule.h" // for FairModule`
	`14`	`+#include "DetectorsPassive/PassiveBase.h"`
`15`	`15`	`#include "Rtypes.h" // for Pipe::Class, ClassDef, Pipe::Streamer`
`16`	`16`
`17`	`17`	`class TGeoPcon;`
`@@ -20,7 +20,7 @@ namespace o2`
`20`	`20`	`{`
`21`	`21`	`namespace passive`
`22`	`22`	`{`
`23`		`-class Pipe : public FairModule`
	`23`	`+class Pipe : public PassiveBase`
`24`	`24`	`{`
`25`	`25`	`public:`
`26`	`26`	`Pipe(const char* name, const char* Title = "Alice Pipe", float rho = 0.f, float thick = 0.f);`