Merge branch 'AliceO2Group:dev' into new-detector4

Author: pkurash

Common/Constants/include/CommonConstants/PhysicsConstants.h

@@ -88,7 +88,8 @@ enum Pdg {
   kHyperHydrogen4 = 1010010040,
   kHyperHelium4 = 1010020040,
   kHyperHelium5 = 1010020050,
-  kHyperHelium4Sigma = 1110020040
+  kHyperHelium4Sigma = 1110020040,
+  kLambda1520_Py = 102134
 };
 
 /// \brief Declarations of masses for additional particles
@@ -150,6 +151,7 @@ constexpr double MassHyperHydrogen4 = 3.922434;
 constexpr double MassHyperHelium4 = 3.921728;
 constexpr double MassHyperHelium5 = 4.839961;
 constexpr double MassHyperHelium4Sigma = 3.995;
+constexpr double MassLambda1520_Py = 1.5195;
 
 /// \brief Declarations of masses for particles in ROOT PDG_t
 constexpr double MassDown = 0.00467;

Common/Constants/include/CommonConstants/make_pdg_header.py

@@ -144,7 +144,7 @@ class Pdg(Enum):
     kHyperHelium4 = 1010020040
     kHyperHelium5 = 1010020050
     kHyperHelium4Sigma = 1110020040
-
+    kLambda1520_Py = 102134  # PYTHIA code different from PDG
 
 dbPdg = ROOT.o2.O2DatabasePDG
 

DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/TimeDeadMap.h

@@ -14,9 +14,12 @@
 #ifndef ALICEO2_ITSMFT_TIMEDEADMAP_H
 #define ALICEO2_ITSMFT_TIMEDEADMAP_H
 
-#include "Rtypes.h"
-#include <vector>
+#include <Rtypes.h>
+
+#include <cstdint>
 #include <map>
+#include <string>
+#include <vector>
 
 namespace o2
 {

DataFormats/Headers/include/Headers/Stack.h

@@ -38,7 +38,7 @@ struct Stack {
   struct freeobj {
     freeobj(memory_resource* mr) : resource(mr) {}
     memory_resource* resource{nullptr};
-    void operator()(std::byte* ptr) { resource->deallocate(ptr, 0, 0); }
+    void operator()(std::byte* ptr) { resource->deallocate(ptr, 0, alignof(std::max_align_t)); }
   };
 
  public:

Detectors/CTP/workflowScalers/src/ctp-ccdb-orbit.cxx

@@ -124,7 +124,14 @@ int main(int argc, char** argv)
       ret = api.storeAsTFileAny(&(vect), ccdbPath, metadata, tmin, tmax);
     } else {
       std::cout << "Storing:" << ccdbPath << " tmin:" << tmin << " tmax:" << tmax << " ts:" << tt << std::endl;
-      ret = api.storeAsTFileAny(&(vect), ccdbPath, metadata, tmin, tmax);
+      std::string filename = "orbitReset.root";
+      TClass* tcls = TClass::GetClass(typeid(vect));
+      auto ti = tcls->GetTypeInfo();
+      auto classname = "std::vector<int64_t>";
+      metadata["adjustableEOV"] = "true";
+      ret = api.storeAsTFile_impl(&(vect), *ti, ccdbPath, metadata, tmin, tmax);
+      o2::ccdb::CcdbObjectInfo oi(ccdbPath, classname, filename, metadata, tmin, tmax);
+      adjustOverriddenEOV(api, oi);
     }
   }
   //

Detectors/ITSMFT/ITS/macros/test/CMakeLists.txt

@@ -113,3 +113,8 @@ o2_add_test_root_macro(CheckDuplicates.C
                        PUBLIC_LINK_LIBRARIES O2::DataFormatsITS
                                              O2::DataFormatsITSMFT
                        LABELS its)
+
+o2_add_test_root_macro(CheckDROF.C
+                       PUBLIC_LINK_LIBRARIES O2::DataFormatsITS
+                                             O2::DataFormatsITSMFT
+                       LABELS its)