Revert "Various improvements"

This reverts commit 4b6530f.

Author: sawenzel

Common/SimConfig/include/SimConfig/SimConfig.h

@@ -52,6 +52,7 @@ struct SimConfigData {
   std::vector<std::string> mActiveModules;            // list of active modules
   std::vector<std::string> mReadoutDetectors;         // list of readout detectors
   std::string mMCEngine;                              // chosen VMC engine
+  bool mNoLoopers = false;                            // Disable automatic TPC loopers
   std::string mGenerator;                             // chosen VMC generator
   std::string mTrigger;                               // chosen VMC generator trigger
   unsigned int mNEvents;                              // number of events to be simulated
@@ -138,6 +139,8 @@ class SimConfig
   // get selected active detectors
   std::vector<std::string> const& getActiveModules() const { return mConfigData.mActiveModules; }
   std::vector<std::string> const& getReadoutDetectors() const { return mConfigData.mReadoutDetectors; }
+  // get loopers veto
+  bool getLoopersVeto() const { return mConfigData.mNoLoopers; }
 
   // static helper functions to determine list of active / readout modules
   // can also be used from outside

Common/SimConfig/src/SimConfig.cxx

@@ -74,6 +74,7 @@ void SimConfig::initOptions(boost::program_options::options_description& options
     "run", bpo::value<int>()->default_value(-1), "ALICE run number")(
     "asservice", bpo::value<bool>()->default_value(false), "run in service/server mode")(
     "noGeant", bpo::bool_switch(), "prohibits any Geant transport/physics (by using tight cuts)")(
+    "noLoopers", bpo::bool_switch(), "disable automatic TPC loopers")(
     "forwardKine", bpo::bool_switch(), "forward kinematics on a FairMQ channel")(
     "noDiscOutput", bpo::bool_switch(), "switch off writing sim results to disc (useful in combination with forwardKine)");
   options.add_options()("fromCollContext", bpo::value<std::string>()->default_value(""), "Use a pregenerated collision context to infer number of events to simulate, how to embedd them, the vertex position etc. Takes precedence of other options such as \"--nEvents\". The format is COLLISIONCONTEXTFILE.root[:SIGNALNAME] where SIGNALNAME is the event part in the context which is relevant.");
@@ -297,6 +298,7 @@ bool SimConfig::resetFromParsedMap(boost::program_options::variables_map const&
   using o2::detectors::DetID;
   mConfigData.mMCEngine = vm["mcEngine"].as<std::string>();
   mConfigData.mNoGeant = vm["noGeant"].as<bool>();
+  mConfigData.mNoLoopers = vm["noLoopers"].as<bool>();
 
   // Reset modules and detectors as they are anyway re-parsed
   mConfigData.mReadoutDetectors.clear();

Generators/CMakeLists.txt

@@ -67,7 +67,7 @@ if(HepMC3_FOUND)
 endif()
 
 if(onnxruntime_FOUND)
-  target_compile_definitions(${targetName} PUBLIC GENERATORS_WITH_TPCLOOPERS)
+  target_compile_definitions(${targetName} PUBLIC GENERATORS_WITH_ONNXRUNTIME)
 endif()
 
 set(headers
@@ -96,7 +96,7 @@ set(headers
     )
 
 if(onnxruntime_FOUND)
-  list(APPEND headers
+  list(APPEND headers 
               include/Generators/TPCLoopers.h
               include/Generators/TPCLoopersParam.h)
 endif()

Generators/include/Generators/Generator.h

@@ -17,8 +17,7 @@
 #include "FairGenerator.h"
 #include "TParticle.h"
 #include "Generators/Trigger.h"
-#include "CCDB/BasicCCDBManager.h"
-#ifdef GENERATORS_WITH_TPCLOOPERS
+#ifdef GENERATORS_WITH_ONNXRUNTIME
 #include "Generators/TPCLoopers.h"
 #include "Generators/TPCLoopersParam.h"
 #endif
@@ -78,7 +77,7 @@ class Generator : public FairGenerator
   /** methods to override **/
   virtual Bool_t generateEvent() = 0;   // generates event (in structure internal to generator)
   virtual Bool_t importParticles() = 0; // fills the mParticles vector (transfer from generator state)
-  Bool_t finalizeEvent();               // final part of event generation that can be customised using external macros
+  Bool_t loopers();                     // adds loopers to the event in case TPC is used
   virtual void updateHeader(o2::dataformats::MCEventHeader* eventHeader) {};
   Bool_t triggerEvent();
 
@@ -161,7 +160,7 @@ class Generator : public FairGenerator
   void updateSubGeneratorInformation(o2::dataformats::MCEventHeader* header) const;
 
   // loopers flag
-  Bool_t mAddTPCLoopers = kFALSE;  // Flag is automatically set to true if TPC is in readout detectors, loopers are not vetoed and transport is enabled
+  Bool_t mAddLoopers = kFALSE;
   // collect an ID and a short description of sub-generator entities
   std::unordered_map<int, std::string> mSubGeneratorsIdToDesc;
   // the current ID of the sub-generator used in the current event (if applicable)
@@ -170,11 +169,11 @@ class Generator : public FairGenerator
   // global static information about (upper limit of) number of events to be generated
   static unsigned int gTotalNEvents;
 
-#ifdef GENERATORS_WITH_TPCLOOPERS
+#ifdef GENERATORS_WITH_ONNXRUNTIME
   // Loopers generator instance
   std::unique_ptr<o2::eventgen::GenTPCLoopers> mLoopersGen = nullptr;
-  void initLoopersGen();
 #endif
+  void initLoopersGen();
 
   ClassDefOverride(Generator, 2);
 

Generators/include/Generators/TPCLoopersParam.h

@@ -28,7 +28,6 @@ namespace eventgen
  ** allow the user to modify them
  **/
 struct GenTPCLoopersParam : public o2::conf::ConfigurableParamHelper<GenTPCLoopersParam> {
-  bool loopersVeto = false; // if true, no loopers are generated
   std::string model_pairs = "ccdb://Users/m/mgiacalo/WGAN_ExtGenPair";  // ONNX model for e+e- pair production
   std::string model_compton = "ccdb://Users/m/mgiacalo/WGAN_ExtGenCompton"; // ONNX model for Compton scattering
   std::string poisson = "${O2_ROOT}/share/Generators/egconfig/poisson_params.csv"; // file with Poissonian parameters
@@ -38,8 +37,8 @@ struct GenTPCLoopersParam : public o2::conf::ConfigurableParamHelper<GenTPCLoope
   bool flat_gas = true; // if true, the gas density is considered flat in the TPC volume
   int nFlatGasLoopers = 500;  // number of loopers to be generated per event in case of flat gas
   float fraction_pairs = 0.08; // fraction of loopers
-  float multiplier[2] = {1., 1.}; // multiplier for pairs and compton loopers for Poissonian and Gaussian sampling
-  unsigned int fixedNLoopers[2] = {1, 1}; // fixed number of loopers coming from pairs and compton electrons - valid if flat gas is false and both Poisson and Gaussian params files are empty
+  std::array<float, 2> multiplier = {1., 1.}; // multiplier for pairs and compton loopers for Poissonian and Gaussian sampling
+  std::array<unsigned int, 2> fixedNLoopers = {1, 1}; // fixed number of loopers coming from pairs and compton electrons - valid if flat gas is false and both Poisson and Gaussian params files are empty
   O2ParamDef(GenTPCLoopersParam, "GenTPCLoopers");
 };
 

Generators/include/TPCLoopers.h

@@ -1,7 +1,7 @@
 #ifndef ALICEO2_EVENTGEN_TPCLOOPERS_H_
 #define ALICEO2_EVENTGEN_TPCLOOPERS_H_
 
-#ifdef GENERATORS_WITH_TPCLOOPERS
+#ifdef GENERATORS_WITH_ONNXRUNTIME
 #include <onnxruntime_cxx_api.h>
 #endif
 #include <iostream>
@@ -19,10 +19,12 @@
 #include "TParticle.h"
 #include <filesystem>
 
-#ifdef GENERATORS_WITH_TPCLOOPERS
+#ifdef GENERATORS_WITH_ONNXRUNTIME
 // Static Ort::Env instance for multiple onnx model loading
 extern Ort::Env global_env;
+#endif
 
+#ifdef GENERATORS_WITH_ONNXRUNTIME
 // This class is responsible for loading the scaler parameters from a JSON file
 // and applying the inverse transformation to the generated data.
 struct Scaler
@@ -53,14 +55,14 @@ class ONNXGenerator
     Ort::Session session;
     TRandom3 rand_gen;
 };
-#endif // GENERATORS_WITH_TPCLOOPERS
+#endif // GENERATORS_WITH_ONNXRUNTIME
 
 namespace o2
 {
 namespace eventgen
 {
 
-#ifdef GENERATORS_WITH_TPCLOOPERS
+#ifdef GENERATORS_WITH_ONNXRUNTIME
 class GenTPCLoopers
 {
     public:
@@ -117,7 +119,7 @@ class GenTPCLoopers
         double mTimeEnd = 0.0;                                          // Time limit for the last event
         float mLoopsFractionPairs = 0.08;                               // Fraction of loopers from Pairs
 };
-#endif // GENERATORS_WITH_TPCLOOPERS
+#endif // GENERATORS_WITH_ONNXRUNTIME
 
 } // namespace eventgen
 } // namespace o2