Suppress firstBC and firstOrbit opts. use instead HBFUtils.orbitFirstSampled.

Save HBFUtils.orbitFirstSampled as DigitizationContext::mFirstOrbitForSampling

Author: shahor02

DataFormats/simulation/include/SimulationDataFormat/DigitizationContext.h

@@ -48,6 +48,9 @@ class DigitizationContext
  public:
   DigitizationContext() : mNofEntries{0}, mMaxPartNumber{0}, mEventRecords(), mEventParts() {}
 
+  uint32_t getFirstOrbitForSampling() const { return mFirstOrbitForSampling; }
+  void setFirstOrbitForSampling(uint32_t o) { mFirstOrbitForSampling = o; }
+
   int getNCollisions() const { return mNofEntries; }
   void setNCollisions(int n) { mNofEntries = n; }
 
@@ -111,6 +114,8 @@ class DigitizationContext
  private:
   int mNofEntries = 0;
   int mMaxPartNumber = 0; // max number of parts in any given collision
+  uint32_t mFirstOrbitForSampling = 0; // 1st orbit to start sampling
+
   float mMuBC;            // probability of hadronic interaction per bunch
 
   std::vector<o2::InteractionTimeRecord> mEventRecords;
@@ -127,7 +132,7 @@ class DigitizationContext
   std::string mQEDSimPrefix;                         // prefix for QED production/contribution
   mutable o2::parameters::GRPObject* mGRP = nullptr; //!
 
-  ClassDefNV(DigitizationContext, 3);
+  ClassDefNV(DigitizationContext, 4);
 };
 
 /// function reading the hits from a chain (previously initialized with initSimChains

Steer/DigitizerWorkflow/src/SimReaderSpec.cxx

@@ -20,6 +20,7 @@
 #include "Steer/InteractionSampler.h"
 #include "CommonDataFormat/InteractionRecord.h"
 #include "DataFormatsTPC/TPCSectorHeader.h"
+#include "DetectorsRaw/HBFUtils.h"
 #include <FairMQLogger.h>
 #include <TMessage.h> // object serialization
 #include <memory>     // std::unique_ptr
@@ -116,12 +117,8 @@ DataProcessorSpec getSimReaderSpec(SubspecRange range, const std::vector<std::st
       LOG(INFO) << "Imposing hadronic interaction rate " << intRate << "Hz";
       mgr.getInteractionSampler().setInteractionRate(intRate);
 
-      int bc0 = ctx.options().get<int>("firstBC");
-      int orbit0 = ctx.options().get<int>("firstOrbit");
-      if (bc0 < 0 || orbit0 < 0) {
-        throw std::runtime_error("negative 1st orbit or BC provided");
-      }
-      mgr.getInteractionSampler().setFirstIR({uint16_t(bc0 % o2lhc::LHCMaxBunches), orbit0 + uint32_t(bc0 / o2lhc::LHCMaxBunches)});
+      mgr.getInteractionSampler().setFirstIR({0, o2::raw::HBFUtils::Instance().orbitFirstSampled});
+      mgr.getDigitizationContext().setFirstOrbitForSampling(o2::raw::HBFUtils::Instance().orbitFirstSampled);
 
       auto bcPatternFile = ctx.options().get<std::string>("bcPatternFile");
       if (!bcPatternFile.empty()) {
@@ -207,8 +204,6 @@ DataProcessorSpec getSimReaderSpec(SubspecRange range, const std::vector<std::st
     /* OPTIONS */
     Options{
       {"interactionRate", VariantType::Float, 50000.0f, {"Total hadronic interaction rate (Hz)"}},
-      {"firstBC", VariantType::Int, 0, {"First BC in interaction sampling, will affect 1st orbit if > LHCMaxBunches"}},
-      {"firstOrbit", VariantType::Int, 1, {"First orbit in interaction sampling"}},
       {"bcPatternFile", VariantType::String, "", {"Interacting BC pattern file (e.g. from CreateBCPattern.C)"}},
       {"simPrefixQED", VariantType::String, "", {"Sim (QED) input prefix (example: path/o2qed). The prefix allows to find files like path/o2qed_Kine.root etc."}},
       {"qed-x-section-ratio", VariantType::Float, -1.f, {"Ratio of cross sections QED/hadronic events. Determines QED interaction rate from hadronic interaction rate."}},

prodtests/full_system_test.sh

@@ -69,14 +69,14 @@ else
 fi
 
 taskwrapper sim.log o2-sim --seed $O2SIMSEED -n $NEvents --skipModules ZDC --configKeyValues "Diamond.width[2]=6." -g pythia8hi -j $NJOBS
-taskwrapper digi.log o2-sim-digitizer-workflow -n $NEvents --simPrefixQED qed/o2sim --qed-x-section-ratio ${QED2HAD} ${NOMCLABELS} --firstOrbit 0 --firstBC 0 --tpc-lanes $((NJOBS < 36 ? NJOBS : 36)) --shm-segment-size $SHMSIZE ${GLOBALDPLOPT} ${DIGITRDOPT}
-[ $SPLITTRDDIGI == "1" ] && taskwrapper digiTRD.log o2-sim-digitizer-workflow -n $NEvents ${NOMCLABELS} --firstOrbit 0 --firstBC 0 --onlyDet TRD --shm-segment-size $SHMSIZE ${GLOBALDPLOPT} --incontext collisioncontext.root ${DIGITRDOPTREAL}
+taskwrapper digi.log o2-sim-digitizer-workflow -n $NEvents --simPrefixQED qed/o2sim --qed-x-section-ratio ${QED2HAD} ${NOMCLABELS} --tpc-lanes $((NJOBS < 36 ? NJOBS : 36)) --shm-segment-size $SHMSIZE ${GLOBALDPLOPT} ${DIGITRDOPT}
+[ $SPLITTRDDIGI == "1" ] && taskwrapper digiTRD.log o2-sim-digitizer-workflow -n $NEvents ${NOMCLABELS} --onlyDet TRD --shm-segment-size $SHMSIZE ${GLOBALDPLOPT} --incontext collisioncontext.root ${DIGITRDOPTREAL}
 touch digiTRD.log_done
 
 mkdir -p zdc
 cd zdc
 taskwrapper zdcsim.log o2-sim --seed $O2SIMSEED -n $NEvents -m PIPE ZDC --configKeyValues '"Diamond.width[2]=6.;SimCutParams.maxRTracking=50;"' -g pythia8hi -j $NJOBS
-taskwrapper digiZDC.log o2-sim-digitizer-workflow -n $NEvents ${NOMCLABELS} --firstOrbit 0 --firstBC 0 --onlyDet ZDC --shm-segment-size $SHMSIZE ${GLOBALDPLOPT} --incontext ../collisioncontext.root
+taskwrapper digiZDC.log o2-sim-digitizer-workflow -n $NEvents ${NOMCLABELS} --onlyDet ZDC --shm-segment-size $SHMSIZE ${GLOBALDPLOPT} --incontext ../collisioncontext.root
 cp zdcdigits.root ../
 cd ..