Merge branch 'AliceO2Group:dev' into new-detector4

Author: pkurash

CCDB/include/CCDB/CcdbApi.h

@@ -348,6 +348,11 @@ class CcdbApi //: public DatabaseInterface
   TObject* retrieveFromTFile(std::string const& path, std::map<std::string, std::string> const& metadata, long timestamp,
                              std::map<std::string, std::string>* headers, std::string const& etag,
                              const std::string& createdNotAfter, const std::string& createdNotBefore) const;
+  void loadFileToMemory(std::vector<char>& dest, std::string const& path,
+                        std::map<std::string, std::string> const& metadata, long timestamp,
+                        std::map<std::string, std::string>* headers, std::string const& etag,
+                        const std::string& createdNotAfter, const std::string& createdNotBefore, bool considerSnapshot = true) const;
+
 #if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__ROOTCLING__) && !defined(__CLING__)
   typedef struct RequestContext {
     o2::pmr::vector<char>& dest;

CCDB/src/CcdbApi.cxx

@@ -1870,6 +1870,21 @@ void CcdbApi::saveSnapshot(RequestContext& requestContext) const
   }
 }
 
+void CcdbApi::loadFileToMemory(std::vector<char>& dest, std::string const& path,
+                               std::map<std::string, std::string> const& metadata, long timestamp,
+                               std::map<std::string, std::string>* headers, std::string const& etag,
+                               const std::string& createdNotAfter, const std::string& createdNotBefore, bool considerSnapshot) const
+{
+  o2::pmr::vector<char> destP;
+  destP.reserve(dest.size());
+  loadFileToMemory(destP, path, metadata, timestamp, headers, etag, createdNotAfter, createdNotBefore, considerSnapshot);
+  dest.clear();
+  dest.reserve(destP.size());
+  for (const auto c : destP) {
+    dest.push_back(c);
+  }
+}
+
 void CcdbApi::loadFileToMemory(o2::pmr::vector<char>& dest, std::string const& path,
                                std::map<std::string, std::string> const& metadata, long timestamp,
                                std::map<std::string, std::string>* headers, std::string const& etag,

Common/Topologies/o2prototype_topology.xml

@@ -74,7 +74,7 @@ The following parameters need adjustment when extending the FLP-EPN configuratio
     </decltask>
 
     <decltask id="tracker">
-        <exe reachable="true">$ALICEO2_INSTALL_DIR/bin/aliceHLTWrapper Tracker_%collectionIndex%_%taskIndex% 1 --dds --poll-period 100 --input type=pull,size=5000,method=connect,property=EPNReceiverOutputAddress,count=1 --output type=push,size=500,method=bind,property=TrackingOutputAddress,min-port=48000 --library libAliHLTTPC.so --component TPCCATracker --run 167808 --parameter '-GlobalTracking -allowGPU -GPUHelperThreads 4 -loglevel=0x7c'</exe>
+        <exe reachable="true">$ALICEO2_INSTALL_DIR/bin/aliceHLTWrapper Tracker_%collectionIndex%_%taskIndex% 1 --dds --poll-period 100 --input type=pull,size=5000,method=connect,property=EPNReceiverOutputAddress,count=1 --output type=push,size=500,method=bind,property=TrackingOutputAddress,min-port=48000 --library libAliHLTTPC.so --component TPCCATracker --run 167808 --parameter '-GlobalTracking -allowGPU -loglevel=0x7c'</exe>
         <!-- <requirement></requirement> -->
         <properties>
             <id access="read">EPNReceiverOutputAddress</id>

Detectors/MUON/MCH/Align/src/AlignmentSpec.cxx

@@ -208,11 +208,21 @@ class AlignmentTask
 
     auto doEvaluation = ic.options().get<bool>("do-evaluation");
     mAlign.SetDoEvaluation(doEvaluation);
+
     // Variation range for parameters
-    mAlign.SetAllowedVariation(0, 2.0);
-    mAlign.SetAllowedVariation(1, 0.3);
-    mAlign.SetAllowedVariation(2, 0.002);
-    mAlign.SetAllowedVariation(3, 2.0);
+    auto AllowX = ic.options().get<float>("variation-x");
+    auto AllowY = ic.options().get<float>("variation-y");
+    auto AllowPhi = ic.options().get<float>("variation-phi");
+    auto AllowZ = ic.options().get<float>("variation-z");
+    mAlign.SetAllowedVariation(0, AllowX);
+    mAlign.SetAllowedVariation(1, AllowY);
+    mAlign.SetAllowedVariation(2, AllowPhi);
+    mAlign.SetAllowedVariation(3, AllowZ);
+
+    // Sigma XY
+    auto SigmaX = ic.options().get<float>("sigma-x");
+    auto SigmaY = ic.options().get<float>("sigma-y");
+    mAlign.SetSigmaXY(SigmaX, SigmaY);
 
     // Configuration for track fitter
     const auto& trackerParam = TrackerParam::Instance();
@@ -223,14 +233,28 @@ class AlignmentTask
     mImproveCutChi2 = 2. * trackerParam.sigmaCutForImprovement * trackerParam.sigmaCutForImprovement;
 
     // Fix chambers
-    auto input_fixchambers = ic.options().get<string>("fix-chamber");
-    std::stringstream string_chambers(input_fixchambers);
-    string_chambers >> std::ws;
-    while (string_chambers.good()) {
-      string substr;
-      std::getline(string_chambers, substr, ',');
-      LOG(info) << Form("%s%d", "Fixing chamber: ", std::stoi(substr));
-      mAlign.FixChamber(std::stoi(substr));
+    TString chambersString = ic.options().get<string>("fix-chamber");
+    std::unique_ptr<TObjArray> objArray(chambersString.Tokenize(","));
+    if (objArray->GetEntries() > 0) {
+      for (int iVar = 0; iVar < objArray->GetEntries(); ++iVar) {
+        LOG(info) << Form("%s%d", "Fixing chamber: ", std::stoi(objArray->At(iVar)->GetName()));
+        mAlign.FixChamber(std::stoi(objArray->At(iVar)->GetName()));
+      }
+    }
+
+    // Fix DEs
+    TString DEString = ic.options().get<string>("fix-de");
+    TString MaskDEString = ic.options().get<string>("mask-fix-de");
+    std::unique_ptr<TObjArray> objArrayDE(DEString.Tokenize(","));
+    std::unique_ptr<TObjArray> objArrayMask(MaskDEString.Tokenize(","));
+    if (objArrayDE->GetEntries() > 0) {
+      if (objArrayDE->GetEntries() != objArrayMask->GetEntries()) {
+        LOG(fatal) << "Inconsistent size of DEs and Masks!";
+      }
+      for (int iVar = 0; iVar < objArrayDE->GetEntries(); ++iVar) {
+        LOG(info) << Form("%s%d%s%d", "Fixing DE: ", std::stoi(objArrayDE->At(iVar)->GetName()), " with mask: ", std::stoi(objArrayMask->At(iVar)->GetName()));
+        mAlign.FixDetElem(std::stoi(objArrayDE->At(iVar)->GetName()), std::stoi(objArrayMask->At(iVar)->GetName()));
+      }
     }
 
     doMatched = ic.options().get<bool>("matched");
@@ -902,6 +926,14 @@ o2::framework::DataProcessorSpec getAlignmentSpec(bool disableCCDB)
             {"matched", VariantType::Bool, false, {"Switch for using MCH-MID matched tracks"}},
             {"fix-chamber", VariantType::String, "", {"Chamber fixing, ex 1,2,3"}},
             {"use-record", VariantType::Bool, false, {"Option for directly using record in alignment if provided"}},
+            {"variation-x", VariantType::Float, 2.0, {"Allowed variation for x axis in cm"}},
+            {"variation-y", VariantType::Float, 0.3, {"Allowed variation for y axis in cm"}},
+            {"variation-phi", VariantType::Float, 0.002, {"Allowed variation for phi axis in rad"}},
+            {"variation-z", VariantType::Float, 2.0, {"Allowed variation for z axis in cm"}},
+            {"sigma-x", VariantType::Float, 1000.0, {"Sigma cut along X"}},
+            {"sigma-y", VariantType::Float, 1000.0, {"Sigma cut along Y"}},
+            {"fix-de", VariantType::String, "", {"DE fixing, ex 101,1019"}},
+            {"mask-fix-de", VariantType::String, "", {"Mask for DE d.o.f fixing, ex 0,2,4"}},
             {"output", VariantType::String, "Alignment", {"Option for name of output file"}}}};
 }
 

Detectors/TPC/base/include/TPCBase/CDBTypes.h

@@ -110,7 +110,7 @@ const std::unordered_map<CDBType, const std::string> CDBTypeMap{
   //
   {CDBType::ConfigFEEPad, "TPC/Config/FEEPad"},
   {CDBType::ConfigFEE, "TPC/Config/FEE"},
-  {CDBType::ConfigRunInfo, "TPC/Config/RunInfo"},
+  {CDBType::ConfigRunInfo, "TPC/Config/RunInfoV2"},
   //
   {CDBType::ParDetector, "TPC/Parameter/Detector"},
   {CDBType::ParElectronics, "TPC/Parameter/Electronics"},

Detectors/TPC/base/include/TPCBase/DeadChannelMapCreator.h

@@ -58,10 +58,11 @@ class DeadChannelMapCreator
   void load(long timeStampOrRun);
   void loadFEEConfigViaRunInfoTS(long timeStamp);
   void loadFEEConfigViaRunInfo(long timeStampOrRun);
-  void loadFEEConfig(long tag, long createdNotAfter = -1);
+  void loadFEEConfig(long timeStamp = -1);
   void loadIDCPadFlags(long timeStampOrRun);
 
   void setDeadChannelMapIDCPadStatus(const CalDetFlag_t& padStatusMap, PadFlags mask = PadFlags::flagAllNoneGood);
+  void setDeadChannelMapFEEConfig(const FEEConfig& feeConfig) { mDeadChannelMapFEE = feeConfig.getDeadChannelMap(); }
 
   const CalDet<bool>& getDeadChannelMapIDC() const { return mDeadChannelMapIDC; }
   const CalDet<bool>& getDeadChannelMapFEE() const { return mDeadChannelMapFEE; }

Detectors/TPC/base/include/TPCBase/FEEConfig.h

@@ -48,16 +48,19 @@ struct CRUConfig {
 struct FEEConfig {
   /// Tag definitions for TPC/Config/FEE
   enum class Tags : uint8_t {
-    Unspecified = 0,    ///< Unspecified
-    TestWithZS = 1,     ///< Test configuration with ZS
-    Pedestals = 2,      ///< Configuration for Pedestal data taking
-    Pulser = 3,         ///< Configuration for Pulser data taking
-    Laser = 4,          ///< Configuration for Laser data taking
-    Cosmics = 5,        ///< Configuration for Cosmics data taking
-    Physics35sigma = 6, ///< Physics configuration with 3.5 sigma thresholds
-    Physics30sigma = 7, ///< Physics configuration with 3.0 sigma thresholds
-    Physics25sigma = 8, ///< Physics configuration with 2.5 sigma thresholds
-    Laser10ADCoff = 9,  ///< Configuration for Laser data taking with 10ADC offset for special studies
+    Unspecified = 0,         ///< Unspecified
+    TestWithZS = 1,          ///< Test configuration with ZS
+    Pedestals = 2,           ///< Configuration for Pedestal data taking
+    Pulser = 3,              ///< Configuration for Pulser data taking
+    Laser = 4,               ///< Configuration for Laser data taking
+    Cosmics = 5,             ///< Configuration for Cosmics data taking
+    Physics35sigma = 6,      ///< Physics configuration with 3.5 sigma thresholds
+    Physics30sigma = 7,      ///< Physics configuration with 3.0 sigma thresholds
+    Physics25sigma = 8,      ///< Physics configuration with 2.5 sigma thresholds
+    Laser10ADCoff = 9,       ///< Configuration for Laser data taking with 10ADC offset for special studies
+    TestNoFilters = 10,      ///< Test configuration without filters
+    Physics2025sigma = 11,   ///< Physics configuration with 2.0/2.5 sigma thresholds (IROC/OROC)
+    Physics30sigmaPbPb = 12, ///< Physics configuration with 3.0 sigma thresholds for PbPb (using differnet CMC settings wrt. pp config 7)
   };
 
   enum class PadConfig {

Detectors/TPC/base/src/CDBInterface.cxx

@@ -556,7 +556,7 @@ void CDBInterface::createFEEConfig()
 
   if (!mUseDefaults) {
     LOGP(info, "trying to load default FEEConfig");
-    mDeadChannelMapCreator.loadFEEConfig(7, 1680525888290); // load oldest physics configuration
+    mDeadChannelMapCreator.loadFEEConfig(1680525888290); // load oldest physics configuration
     if (mFEEConfig) {
       return;
     }

Detectors/TPC/base/src/DeadChannelMapCreator.cxx

@@ -43,13 +43,7 @@ void DeadChannelMapCreator::loadFEEConfigViaRunInfoTS(long timeStamp)
   if (mObjectValidity[CDBType::ConfigRunInfo].isValid(timeStamp)) {
     return;
   }
-  const auto meta = mCCDBApi.retrieveHeaders(CDBTypeMap.at(CDBType::ConfigRunInfo), {}, timeStamp);
-  mObjectValidity[CDBType::ConfigRunInfo].startvalidity = std::stol(meta.at("Valid-From"));
-  mObjectValidity[CDBType::ConfigRunInfo].endvalidity = std::stol(meta.at("Valid-Until"));
-  const long tag = std::stol(meta.at("Tag"));
-  LOGP(info, "Loading FEE config for time stamp {}, via RunInfo with Tag {}, RunType {}, runNumber {}, validity: {} - {}",
-       timeStamp, tag, meta.at("RunType"), meta.at("runNumber"), meta.at("Valid-From"), meta.at("Valid-Until"));
-  loadFEEConfig(tag, timeStamp);
+  loadFEEConfig(timeStamp);
 }
 
 //______________________________________________________________________________
@@ -59,13 +53,16 @@ void DeadChannelMapCreator::loadFEEConfigViaRunInfo(long timeStampOrRun)
 }
 
 //______________________________________________________________________________
-void DeadChannelMapCreator::loadFEEConfig(long tag, long createdNotAfter)
+void DeadChannelMapCreator::loadFEEConfig(long timeStamp)
 {
-  std::map<std::string, std::string> mm, meta;
-  const std::string createdNotAfterS = (createdNotAfter < 0) ? "" : std::to_string(createdNotAfter);
-  mFEEConfig.reset(mCCDBApi.retrieveFromTFileAny<o2::tpc::FEEConfig>(CDBTypeMap.at(CDBType::ConfigFEE), mm, tag, &meta, "", createdNotAfterS));
+  std::map<std::string, std::string> meta;
+  mFEEConfig.reset(mCCDBApi.retrieveFromTFileAny<o2::tpc::FEEConfig>(CDBTypeMap.at(CDBType::ConfigRunInfo), {}, timeStamp, &meta));
+  std::string redirect = "not found";
+  if (meta.find("Redirect") != meta.end()) {
+    redirect = meta.at("Redirect");
+  }
   if (!mFEEConfig) {
-    LOGP(error, "Could not load {}/{}, createdNotAfter: {}", CDBTypeMap.at(CDBType::ConfigFEE), tag, createdNotAfterS);
+    LOGP(error, "Could not load {} redirected from {} with Redirect={}, createdNotAfter: {}", CDBTypeMap.at(CDBType::ConfigFEE), CDBTypeMap.at(CDBType::ConfigRunInfo), redirect, timeStamp);
     return;
   }
   LOGP(info, "Using FEE config for Tag {}, ETag {}, Last-Modified {}", meta.at("Valid-From"), meta.at("ETag"), meta.at("Last-Modified"));

Detectors/TPC/base/src/FEEConfig.cxx

@@ -57,6 +57,9 @@ const std::unordered_map<FEEConfig::Tags, const std::string> FEEConfig::TagNames
   {Tags::Physics30sigma, "Physics30sigma"},
   {Tags::Physics25sigma, "Physics25sigma"},
   {Tags::Laser10ADCoff, "Laser10ADCoff"},
+  {Tags::TestNoFilters, "TestNoFilter"},
+  {Tags::Physics2025sigma, "Physics2025sigma"},
+  {Tags::Physics30sigmaPbPb, "Physics30sigmaPbPb"},
 };
 
 const std::unordered_map<FEEConfig::PadConfig, const std::string> FEEConfig::PadConfigNames{