Merge branch 'fd3_digits' of github.com:pkurash/AliceO2 into fd3_digits

Author: pkurash

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

@@ -468,6 +468,9 @@ class EncodedBlocks
   /// total allocated size in bytes
   size_t size() const { return mRegistry.size; }
 
+  /// used part of total allocated size in bytes (output size)
+  size_t outputsize() const { return mRegistry.offsFreeStart; }
+
   /// size remaining for additional data
   size_t getFreeSize() const { return mRegistry.getFreeSize(); }
 
@@ -899,7 +902,7 @@ void EncodedBlocks<H, N, W>::print(const std::string& prefix, int verbosity) con
       ndata += mBlocks[i].getNData();
       nlit += mBlocks[i].getNLiterals();
     }
-    LOG(info) << prefix << N << " blocks, input size: " << inpSize << ", output size: " << size()
+    LOG(info) << prefix << N << " blocks, input size: " << inpSize << ", output size: " << outputsize()
               << " NDictWords: " << ndict << " NDataWords: " << ndata << " NLiteralWords: " << nlit;
   }
 }

DataFormats/Detectors/TPC/CMakeLists.txt

@@ -40,7 +40,6 @@ o2_add_library(
 
 o2_target_root_dictionary(
   DataFormatsTPC
-  EXTRA_PATCH src/VectorPadflagsCustomStreamer.cxx
   HEADERS include/DataFormatsTPC/ClusterGroupAttribute.h
           include/DataFormatsTPC/ClusterNative.h
           include/DataFormatsTPC/ClusterNativeHelper.h

DataFormats/Detectors/TPC/src/DataFormatsTPCLinkDef.h

@@ -22,15 +22,15 @@
 #pragma link C++ class o2::tpc::ClusterHardwareContainerFixedSize < 8192> + ;
 #pragma link C++ class o2::tpc::ClusterNativeContainer + ;
 #pragma link C++ class o2::tpc::Digit + ;
-// pragma link C++ enum o2::tpc::PadFlags +;                // enum itself
+#pragma link C++ enum o2::tpc::PadFlags + ; // enum itself
 #pragma link C++ class o2::tpc::ZeroSuppressedContainer8kb + ;
 #pragma link C++ class std::vector < o2::tpc::ClusterNative> + ;
 #pragma link C++ class std::vector < o2::tpc::ClusterNativeContainer> + ;
 #pragma link C++ class std::vector < o2::tpc::ClusterHardware> + ;
 #pragma link C++ class std::vector < o2::tpc::ClusterHardwareContainerFixedSize < 8192>> + ;
 #pragma link C++ class std::vector < o2::tpc::ClusterHardwareContainer8kb> + ;
 #pragma link C++ class std::vector < o2::tpc::Digit> + ;
-// pragma link C++ class std::vector < o2::tpc::PadFlags> + ;
+#pragma link C++ class std::vector < o2::tpc::PadFlags> + ;
 #pragma link C++ class std::vector < o2::tpc::ZeroSuppressedContainer8kb> + ;
 #pragma link C++ class o2::tpc::TrackTPC + ;
 #pragma link C++ class o2::tpc::LaserTrack + ;

DataFormats/Detectors/TPC/src/VectorPadflagsCustomStreamer.cxx

@@ -312,7 +312,7 @@ bool create_GRPs(Options const& opts)
     auto soreor = ccdbmgr.getRunDuration(opts.run);
     runStart = soreor.first;
     grp.setTimeStart(runStart);
-    grp.setTimeEnd(runStart + 3600000);
+    grp.setTimeEnd(soreor.second);
     grp.setNHBFPerTF(opts.orbitsPerTF);
     std::vector<std::string> modules{};
     if (!o2::conf::SimConfig::determineActiveModulesList(opts.detectorList, opts.readout, std::vector<std::string>(), modules)) {

DataFormats/Parameters/src/GRPTool.cxx

@@ -699,6 +699,7 @@ DigitizationContext DigitizationContext::extractSingleTimeframe(int timeframeid,
   r.mSimPrefixes = mSimPrefixes;
   r.mMuBC = mMuBC;
   r.mBCFilling = mBCFilling;
+  r.mDigitizerInteractionRate = mDigitizerInteractionRate;
   try {
     auto tf_ranges = timeframeindices.at(timeframeid);
 

DataFormats/simulation/src/DigitizationContext.cxx

@@ -37,7 +37,7 @@
 #include "CommonUtils/TreeStreamRedirector.h"
 #include "TPCCalibration/VDriftHelper.h"
 #include "TPCCalibration/CorrectionMapsLoader.h"
-#include "GPUO2Interface.h"
+#include "GPUO2ExternalUser.h"
 #include "GPUO2InterfaceUtils.h"
 #include "GPUParam.h"
 #include "Headers/DataHeader.h"

Detectors/Align/Workflow/src/BarrelAlignmentSpec.cxx

@@ -54,7 +54,7 @@
 #include <TTree.h>
 #include <TFile.h>
 #include "Align/Mille.h"
-// #include "GPUO2Interface.h"
+// #include "GPUO2ExternalUser.h"
 // #include "DataFormatsTPC/WorkflowHelper.h"
 
 namespace o2

Detectors/Align/include/Align/Controller.h

@@ -24,7 +24,7 @@
 #include "DataFormatsTPC/WorkflowHelper.h"
 #include <TMath.h>
 #include <TGeoManager.h>
-#include "GPUO2Interface.h"
+#include "GPUO2ExternalUser.h"
 #include "DataFormatsTPC/WorkflowHelper.h"
 #include "GPUParam.inc"
 

Detectors/Align/src/AlignableDetectorTPC.cxx

@@ -44,7 +44,7 @@
 #include <TH1F.h>
 #include <TList.h>
 #include <cstdio>
-#include "GPUO2Interface.h"
+#include "GPUO2ExternalUser.h"
 #include "DataFormatsTPC/WorkflowHelper.h"
 #include <TGeoGlobalMagField.h>
 #include "CommonUtils/NameConf.h"