Revert "First implementation of loopers inclusion in base Generator class"

This reverts commit b8c867d.

Author: sawenzel

Common/SimConfig/include/SimConfig/SimConfig.h

@@ -52,7 +52,6 @@ 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
@@ -139,8 +138,6 @@ 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,7 +74,6 @@ 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.");
@@ -298,7 +297,6 @@ 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

@@ -41,8 +41,6 @@ o2_add_library(Generators
                        src/GeneratorTParticleParam.cxx
                        src/GeneratorService.cxx
                        src/FlowMapper.cxx
-                       $<$<BOOL:${onnxruntime_FOUND}>:src/TPCLoopers.cxx>
-                       $<$<BOOL:${onnxruntime_FOUND}>:src/TPCLoopersParam.cxx>
                        $<$<BOOL:${pythia_FOUND}>:src/GeneratorPythia8.cxx>
                        $<$<BOOL:${pythia_FOUND}>:src/DecayerPythia8.cxx>
                        $<$<BOOL:${pythia_FOUND}>:src/GeneratorPythia8Param.cxx>
@@ -55,7 +53,6 @@ o2_add_library(Generators
                PUBLIC_LINK_LIBRARIES FairRoot::Base O2::SimConfig O2::CommonUtils O2::DetectorsBase O2::ZDCBase
                                      O2::SimulationDataFormat ${pythiaTarget} ${hepmcTarget}
                                      FairRoot::Gen
-                                     $<$<BOOL:${onnxruntime_FOUND}>:onnxruntime::onnxruntime>
                TARGETVARNAME targetName)
 
 if(pythia_FOUND)
@@ -66,10 +63,6 @@ if(HepMC3_FOUND)
   target_compile_definitions(${targetName} PUBLIC GENERATORS_WITH_HEPMC3)
 endif()
 
-if(onnxruntime_FOUND)
-  target_compile_definitions(${targetName} PUBLIC GENERATORS_WITH_ONNXRUNTIME)
-endif()
-
 set(headers
     include/Generators/Generator.h
     include/Generators/Trigger.h
@@ -95,12 +88,6 @@ set(headers
     include/Generators/FlowMapper.h
     )
 
-if(onnxruntime_FOUND)
-  list(APPEND headers 
-              include/Generators/TPCLoopers.h
-              include/Generators/TPCLoopersParam.h)
-endif()
-
 if(pythia_FOUND)
   list(APPEND headers
               include/Generators/GeneratorPythia8.h

Generators/include/Generators/Generator.h

@@ -17,10 +17,6 @@
 #include "FairGenerator.h"
 #include "TParticle.h"
 #include "Generators/Trigger.h"
-#ifdef GENERATORS_WITH_ONNXRUNTIME
-#include "Generators/TPCLoopers.h"
-#include "Generators/TPCLoopersParam.h"
-#endif
 #include <functional>
 #include <vector>
 #include <unordered_map>
@@ -77,7 +73,6 @@ 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 loopers();                     // adds loopers to the event in case TPC is used
   virtual void updateHeader(o2::dataformats::MCEventHeader* eventHeader) {};
   Bool_t triggerEvent();
 
@@ -159,8 +154,6 @@ class Generator : public FairGenerator
  private:
   void updateSubGeneratorInformation(o2::dataformats::MCEventHeader* header) const;
 
-  // loopers flag
-  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)
@@ -169,12 +162,6 @@ class Generator : public FairGenerator
   // global static information about (upper limit of) number of events to be generated
   static unsigned int gTotalNEvents;
 
-#ifdef GENERATORS_WITH_ONNXRUNTIME
-  // Loopers generator instance
-  std::unique_ptr<o2::eventgen::GenTPCLoopers> mLoopersGen = nullptr;
-#endif
-  void initLoopersGen();
-
   ClassDefOverride(Generator, 2);
 
 }; /** class Generator **/