Optimize run_unpack_tsa + small change to tsEventHeader

core/data/CbmTsEventHeader.h

@@ -10,6 +10,7 @@
 #include <RtypesCore.h>
 
 #include <cstddef>
+#include <cstdint>
 
 class CbmTsEventHeader : public FairEventHeader {
 
@@ -21,7 +22,7 @@ public:
   virtual ~CbmTsEventHeader() {};
 
   /** Get the Start time of the this Timeslice linked to this event header*/
-  ULong64_t GetTsStartTime() { return fTsStartTime; }
+  uint64_t GetTsStartTime() { return fTsStartTime; }
 
   /** @brief Get the number of digis in this Ts */
   ULong64_t GetNDigisPsd(ULong64_t) { return fNDigisPsd; }
@@ -35,7 +36,7 @@ public:
   ULong64_t GetNDigisTrd2D(ULong64_t) { return fNDigisTrd2D; }
 
   /** @brief Set the Ts Start Time @param value Start time of the TS */
-  void SetTsStartTime(ULong64_t value) { fTsStartTime = value; }
+  void SetTsStartTime(uint64_t value) { fTsStartTime = value; }
 
   /** @brief Set the number of digis in this Ts */
   void SetNDigisPsd(ULong64_t value) { fNDigisPsd = value; }
@@ -50,8 +51,8 @@ public:
 
 
 protected:
-  /** Run Id */
-  ULong64_t fTsStartTime = 0;
+  /** Timeslice start time */
+  uint64_t fTsStartTime = 0;
 
   ULong64_t fNDigisPsd   = 0;
   ULong64_t fNDigisRich  = 0;

macro/run/run_unpack_tsa.C

@@ -27,42 +27,6 @@
 std::shared_ptr<CbmTrdUnpackMonitor> GetTrdMonitor(std::string treefilename);
 std::shared_ptr<CbmTrdSpadic> GetTrdSpadic(bool useAvgBaseline = false);
 
-
-/** @brief Macro for CBM reconstruction
- ** @author Volker Friese <v.friese@gsi.de>
- ** @since  14 November 2020
- ** @param input          Name of input file (w/o extension .raw.root)
- ** @param nTimeSlices    Number of time-slices to process
- ** @param firstTimeSlice First time-slice (entry) to be processed
- ** @param output         Name of output file (w/o extension .rec.root)
- ** @param sEvBuildRaw    Option for raw event building
- ** @param setup          Name of predefined geometry setup
- ** @param paramFile      Parameter ROOT file (w/o extension .par.root)
- ** @param useMC          Option to provide the trackfinder with MC information
- **
- ** This macro performs from the digis in a time-slice. It can be used
- ** for simulated data (result of run_digi.C) or real data after unpacking.
- **
- ** The macro covers both time-based reconstruction and event-based
- ** reconstruction using raw events build from digis. This can be selected
- ** by the forth argument. If left empty, no raw event builder will be
- ** employed and reconstruction will be time-based. The option "Ideal"
- ** selects the ideal raw event builder, which associates digis to events
- ** based on the MC truth. The option "Real" selects a real raw event builder
- ** (latest version, for older versions use "Real2018" or "Real2019").
- ** 
- **
- ** The file names must be specified without extensions. The convention is
- ** that the raw (input) file is [input].raw.root. The output file
- ** will be [input].rec.root if not specified by the user. The parameter file
- ** has the extension .par.root. It is assumed to be [input].par.root if
- ** not specified by the user.
- **
- ** If no argument is specified, the input will be set to "test". This allows
- ** to execute the macro chain (run_tra_file.C, run_digi.C and run_reco.C)
- ** from the ROOT prompt without user intervention.
- **
- **/
 void run_unpack_tsa(std::string infile = "test.tsa", UInt_t runid = 0, const char* setupName = "mcbm_beam_2021_03",
                     std::int32_t nevents = -1, std::string outpath = "")
 {
@@ -124,7 +88,7 @@ void run_unpack_tsa(std::string infile = "test.tsa", UInt_t runid = 0, const cha
   auto trdconfig = std::make_shared<CbmTrdUnpackConfig>(trdsetuptag.Data(), 3);
   // trdconfig->SetDebugState();
   trdconfig->SetDoWriteOutput();
-  trdconfig->SetDoWriteOptOutA(CbmTrdRawMessageSpadic::GetBranchName());
+  // trdconfig->SetDoWriteOptOutA(CbmTrdRawMessageSpadic::GetBranchName());
   // trdconfig->SetDoWriteOptOutB("SpadicInfoMessages"); // SpadicInfoMessages
 
   std::string parfilesbasepathTrd = Form("%s/parameters/trd", srcDir.Data());