CTF name contains run, TF 1st orbit and ID, + misc fixes

Author: shahor02

DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/NameConf.h

@@ -101,7 +101,7 @@ class NameConf
   static constexpr std::string_view CTFTREENAME = "ctf"; // hardcoded
 
   // CTF Filename
-  static std::string getCTFFileName(long id, const std::string_view prefix = "o2_ctf");
+  static std::string getCTFFileName(uint32_t run, uint32_t orb, uint32_t id, const std::string_view prefix = "o2_ctf");
 
  private:
   // unmodifiable constants used to construct filenames etc

DataFormats/Detectors/Common/src/NameConf.cxx

@@ -85,7 +85,7 @@ std::string NameConf::getMatLUTFileName(const std::string_view prefix)
   return o2::utils::concat_string(prefix, MATBUDLUT, ".root");
 }
 
-std::string NameConf::getCTFFileName(long id, const std::string_view prefix)
+std::string NameConf::getCTFFileName(uint32_t run, uint32_t orb, uint32_t id, const std::string_view prefix)
 {
-  return o2::utils::concat_string(prefix, "_", fmt::format("{:010d}", id), ".root");
+  return o2::utils::concat_string(prefix, "_", fmt::format("run{:08d}_orbit{:010d}_tf{:010d}", run, orb, id), ".root");
 }

Detectors/CTF/workflow/src/CTFWriterSpec.cxx

@@ -200,19 +200,17 @@ void CTFWriterSpec::run(ProcessingContext& pc)
 {
   auto cput = mTimer.CpuTime();
   mTimer.Start(false);
-  auto tfOrb = DataRefUtils::getHeader<o2::header::DataHeader*>(pc.inputs().getByPos(0))->firstTForbit;
+  const auto dh = DataRefUtils::getHeader<o2::header::DataHeader*>(pc.inputs().getByPos(0));
 
   std::unique_ptr<TFile> fileOut;
   std::unique_ptr<TTree> treeOut;
   if (mWriteCTF) {
-    //    fileOut.reset(TFile::Open(o2::base::NameConf::getCTFFileName(tfOrb).c_str(), "recreate"));
-    // RS Until the DPL will propagate the firstTForbit, we will use simple counter in CTF file name to avoid overwriting in case of multiple TFs
-    fileOut.reset(TFile::Open(o2::base::NameConf::getCTFFileName(mNTF).c_str(), "recreate"));
+    fileOut.reset(TFile::Open(o2::base::NameConf::getCTFFileName(dh->runNumber, dh->firstTForbit, dh->tfCounter).c_str(), "recreate"));
     treeOut = std::make_unique<TTree>(std::string(o2::base::NameConf::CTFTREENAME).c_str(), "O2 CTF tree");
   }
 
   // create header
-  CTFHeader header{mRun, tfOrb};
+  CTFHeader header{mRun, dh->firstTForbit};
 
   processDet<o2::itsmft::CTF>(pc, DetID::ITS, header, treeOut.get());
   processDet<o2::itsmft::CTF>(pc, DetID::MFT, header, treeOut.get());

prodtests/full-system-test/dpl-workflow.sh

@@ -84,7 +84,8 @@ fi
 if [ $CTFINPUT == 1 ]; then
   TPC_INPUT=compressed-clusters-ctf
   TOF_INPUT=digits
-  WORKFLOW="o2-ctf-reader-workflow --ctf-input o2_ctf_0000000000.root --onlyDet $CTF_DETECTORS $ARGS_ALL | "
+  CTFName=`ls -t o2_ctf_*.root | head -n1`
+  WORKFLOW="o2-ctf-reader-workflow --ctf-input ${CTFName} --onlyDet $CTF_DETECTORS $ARGS_ALL | "
 elif [ $EXTINPUT == 1 ]; then
   WORKFLOW="o2-dpl-raw-proxy $ARGS_ALL --dataspec \"FLP:FLP/DISTSUBTIMEFRAME/0;B:TPC/RAWDATA;C:ITS/RAWDATA;D:TOF/RAWDATA;D:MFT/RAWDATA;E:FT0/RAWDATA;F:MID/RAWDATA;G:EMC/RAWDATA;H:PHS/RAWDATA;I:CPV/RAWDATA;J:ZDC/RAWDATA;K:HMP/RAWDATA;L:FDD/RAWDATA\" --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@stfb-to-dpl,transport=shmem,rateLogging=0\" | "
 else

prodtests/full_system_test.sh

@@ -36,6 +36,8 @@ NHBPERTF=${NHBPERTF:-128}
 RUNFIRSTORBIT=${RUNFIRSTORBIT:-0}
 FIRSTSAMPLEDORBIT=${FIRSTSAMPLEDORBIT:-0}
 
+[ "$FIRSTSAMPLEDORBIT" -lt "$RUNFIRSTORBIT" ] && FIRSTSAMPLEDORBIT=$RUNFIRSTORBIT
+
 # allow skipping
 JOBUTILS_SKIPDONE=ON
 # enable memory monitoring (independent on whether DPL or not)
@@ -66,7 +68,7 @@ QED2HAD=$(awk "BEGIN {printf \"%.2f\",`grep xSectionQED qedgenparam.ini | cut -d
 echo "Obtained ratio of QED to hadronic x-sections = $QED2HAD" >> qedsim.log
 cd ..
 
-DIGITRDOPTREAL="--configKeyValues \"${HBFUTILPARAMS};TRDSimParams.digithreads=${NJOBS}\" --enable-trd-trapsim"
+DIGITRDOPTREAL="--configKeyValues \"${HBFUTILPARAMS};TRDSimParams.digithreads=${NJOBS}\" "
 if [ $SPLITTRDDIGI == "1" ]; then
   DIGITRDOPT="--configKeyValues \"${HBFUTILPARAMS}\" --skipDet TRD"
 else