Merge c3f4229 into sapling-pr-archive-ktf

Author: ktf

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/DCAFitter/include/DCAFitter/DCAFitterN.h

@@ -324,6 +324,13 @@ class DCAFitterN
     pnt[2] = tr.getZ();
   }
 
+  GPUdi() void clearLogThrottlers()
+  {
+    mLoggerBadCov.clear();
+    mLoggerBadInv.clear();
+    mLoggerBadProp.clear();
+  }
+
   void setBadCovPolicy(BadCovPolicy v) { mBadCovPolicy = v; }
   BadCovPolicy getBadCovPolicy() const { return mBadCovPolicy; }
 
@@ -1084,10 +1091,16 @@ template <int N, typename... Args>
 GPUd() void DCAFitterN<N, Args...>::print() const
 {
 #ifndef GPUCA_GPUCODE_DEVICE
-  LOG(info) << N << "-prong vertex fitter in " << (mUseAbsDCA ? "abs." : "weighted") << " distance minimization mode";
-  LOG(info) << "Bz: " << mBz << " MaxIter: " << mMaxIter << " MaxChi2: " << mMaxChi2;
+  LOG(info) << N << "-prong vertex fitter in " << (mUseAbsDCA ? "abs." : "weighted") << " distance minimization mode, collinear tracks mode: " << (mIsCollinear ? "ON" : "OFF");
+  LOG(info) << "Bz: " << mBz << " MaxIter: " << mMaxIter << " MaxChi2: " << mMaxChi2 << " MatCorrType: " << int(mMatCorr);
   LOG(info) << "Stopping condition: Max.param change < " << mMinParamChange << " Rel.Chi2 change > " << mMinRelChi2Change;
   LOG(info) << "Discard candidates for : Rvtx > " << getMaxR() << " DZ between tracks > " << mMaxDZIni;
+  LOG(info) << "PropagateToPCA:" << mPropagateToPCA << " WeightedFinalPCA:" << mWeightedFinalPCA << " UsePropagator:" << mUsePropagator << " RefitWithMatCorr:" << mRefitWithMatCorr;
+  std::string rep{};
+  for (int i = 0; i < mCrossings.nDCA; i++) {
+    rep += fmt::format("seed{}:{}/{} ", i, mTrPropDone[i], mPropFailed[i]);
+  }
+  LOG(info) << "Last call: NCand:" << mCurHyp << " from " << mCrossings.nDCA << " seeds, prop.done/failed: " << rep;
 #else
   if (mUseAbsDCA) {
     printf("%d-prong vertex fitter in abs. distance minimization mode\n", N);

Common/DCAFitter/test/testDCAFitterN.cxx

@@ -238,6 +238,7 @@ BOOST_AUTO_TEST_CASE(DCAFitterNProngs)
     BOOST_CHECK(meanDA < 0.1);
     BOOST_CHECK(meanDAW < 0.1);
     BOOST_CHECK(meanDW < 0.1);
+    ft.print();
   }
 
   // 2 prongs vertices with collinear tracks (gamma conversion)
@@ -316,6 +317,7 @@ BOOST_AUTO_TEST_CASE(DCAFitterNProngs)
     BOOST_CHECK(meanDA < 2.1);
     BOOST_CHECK(meanDAW < 2.1);
     BOOST_CHECK(meanDW < 2.1);
+    ft.print();
   }
 
   // 2 prongs vertices with one of charges set to 0: Helix : Line
@@ -394,6 +396,7 @@ BOOST_AUTO_TEST_CASE(DCAFitterNProngs)
     BOOST_CHECK(meanDA < 0.1);
     BOOST_CHECK(meanDAW < 0.1);
     BOOST_CHECK(meanDW < 0.1);
+    ft.print();
   }
 
   // 2 prongs vertices with both of charges set to 0: Line : Line
@@ -471,6 +474,7 @@ BOOST_AUTO_TEST_CASE(DCAFitterNProngs)
     BOOST_CHECK(meanDA < 0.1);
     BOOST_CHECK(meanDAW < 0.1);
     BOOST_CHECK(meanDW < 0.1);
+    ft.print();
   }
 
   // 3 prongs vertices
@@ -547,8 +551,8 @@ BOOST_AUTO_TEST_CASE(DCAFitterNProngs)
     BOOST_CHECK(meanDA < 0.1);
     BOOST_CHECK(meanDAW < 0.1);
     BOOST_CHECK(meanDW < 0.1);
+    ft.print();
   }
-
   outStream.Close();
 }
 

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/MUON/MCH/Mapping/Impl4/src/GenCathodeSegmentationCreatorForSegType0.cxx

@@ -272,12 +272,12 @@ CathodeSegmentation* createSegType0(bool isBendingPlane)
        /* 1BG */ {3, 16, {61, 9, 63, 14, 7, 8, 58, 62, 21, 54, 19, 60, 5, 12, 56, 2, 6, 55, 44, 51, 0, 11, 4, 46, 35, 36, 42, 17, 33, 15, 23, 32, 20, 24, 43, 22, 49, 25, 45, 27, 28, 47, 53, 41, 29, 30, 31, 40}},
        /* 1BH */ {3, 16, {7, 9, 63, 61, 62, 60, 19, 21, 16, 58, 56, 57, 12, 6, 55, 54, 52, 0, 51, 48, 46, 2, 4, 42, 44, 13, 35, 11, 34, 33, 17, 32, 20, 23, 22, 43, 25, 47, 45, 49, 50, 27, 31, 29, -1, 40, 30, -1}},
        /* 1BI */ {2, 16, {7, 9, 61, 62, 19, 21, 58, 56, 12, 6, 54, 52, 51, 48, 2, 4, 44, 13, 11, 34, 17, 32, 23, 22, 25, 47, 49, 50, 31, 29, 40, 30}},
-       /* 1BG */
-       {1,
-        16,
-        {59, 16, 57, 10, 52, 1, 48, 3, 13, 34, 18, 37, 38, 26, 50, 39}}},
+       /* 1BG */ {1, 16, {59, 16, 57, 10, 52, 1, 48, 3, 13, 34, 18, 37, 38, 26, 50, 39}}},
       /* PS */
-      {{0.63, 0.42}, {0.84, 0.42}, {1.26, 0.42}, {2.52, 0.42}}};
+      {{0.63, 0.42},
+       {0.84, 0.42},
+       {1.26, 0.42},
+       {2.52, 0.42}}};
   } else {
     return new CathodeSegmentation{
       0,
@@ -515,8 +515,7 @@ CathodeSegmentation* createSegType0(bool isBendingPlane)
        {1267, 14, 3, -0.3149999976, 85.88999939}},
       /* PGT */
       {/* 1NA */ {4, 16, {59, 63, 9, 61, 16, 8, 7, 14, 57, 21, 62, 58, 10, 60, 19, 54, 0, 56, 12, 5, 52, 55, 6, 51, 3, 1, 2, 11, 48, 4, 46, 44, 42, 13, 15, 17, 18, 36, 20, 35, 34, 33, 23, 32, 22, 37, 25, 38, 24, 26, 43, 28, 45, 27, 49, 47, 29, 50, 31, 30, 41, 40, 39, 53}},
-       /* 1NB */
-       {13, 6, {-1, -1, -1, -1, -1, 1, 6, -1, -1, -1, -1, -1, -1, -1, -1, 15, 4, 51, 42, 48, 3, 10, 56, 60, 8, 62, -1, 18, 34, 20, 22, 33, 44, 13, 52, 55, 16, 21, 63, 26, 38, 40, 41, 53, 45, 37, 36, 46, 0, 57, 59, 9, 29, 50, 30, 39, 31, 47, 24, 35, 11, 2, 12, 19, 7, 49, 27, 28, 25, 43, 23, 32, 17, 5, 54, 14, 58, 61}},
+       /* 1NB */ {13, 6, {-1, -1, -1, -1, -1, 1, 6, -1, -1, -1, -1, -1, -1, -1, -1, 15, 4, 51, 42, 48, 3, 10, 56, 60, 8, 62, -1, 18, 34, 20, 22, 33, 44, 13, 52, 55, 16, 21, 63, 26, 38, 40, 41, 53, 45, 37, 36, 46, 0, 57, 59, 9, 29, 50, 30, 39, 31, 47, 24, 35, 11, 2, 12, 19, 7, 49, 27, 28, 25, 43, 23, 32, 17, 5, 54, 14, 58, 61}},
        /* 1NC */ {10, 14, {-1, -1, -1, -1, -1, -1, -1, -1, 9, -1, -1, -1, -1, -1, -1, -1, -1, 63, 7, -1, -1, -1, -1, -1, -1, -1, 8, 62, 60, -1, -1, -1, -1, -1, -1, 21, 61, 59, 19, -1, -1, -1, -1, -1, 16, 56, 14, 58, 12, -1, -1, -1, -1, 57, 55, 6, 54, 1, 0, -1, -1, 10, 5, 3, 52, 2, 51, 4, 48, -1, 11, 46, 13, 44, 36, 18, 17, 42, 15, -1, 20, 23, 22, 24, 37, 38, 33, 34, 35, -1, -1, -1, -1, -1, -1, -1, 26, 25, 32, -1, -1, -1, -1, -1, -1, -1, 45, 27, 43, -1, -1, -1, -1, -1, -1, -1, 29, 47, 28, -1, -1, -1, -1, -1, -1, -1, 49, 30, 50, 31, -1, -1, -1, -1, -1, -1, 53, 41, 40, 39}},
        /* 1ND */ {9, 21, {-1, -1, -1, -1, -1, -1, -1, -1, 9, -1, -1, -1, -1, -1, -1, -1, -1, 7, -1, -1, -1, -1, -1, -1, -1, 63, 62, -1, -1, -1, -1, -1, -1, -1, 8, 61, -1, -1, -1, -1, -1, -1, -1, 21, 19, -1, -1, -1, -1, -1, -1, 60, 14, 58, -1, -1, -1, -1, -1, -1, 10, 6, 54, -1, -1, -1, -1, -1, 16, 1, 2, 51, -1, -1, -1, -1, -1, 12, 48, 13, -1, -1, -1, -1, -1, 59, 5, 11, 18, -1, -1, -1, -1, -1, 55, 46, 36, 20, -1, -1, -1, -1, 56, 52, 44, 22, 24, -1, -1, -1, -1, 0, 15, 33, 26, 43, -1, -1, -1, 57, 17, 23, 45, 28, 30, -1, -1, -1, 34, 37, 27, 49, 39, 40, -1, -1, 4, 35, 38, 29, -1, -1, -1, -1, 3, 42, 32, 25, 31, -1, -1, -1, -1, -1, -1, -1, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, -1, -1, -1, -1, -1, -1, -1, 47, -1, -1, -1, -1}},
        /* 1NE */ {8, 8, {8, 62, 63, 9, 7, 21, 19, 14, 56, 16, 59, 60, 61, 58, 57, 12, 3, 1, 55, 10, 6, 54, 0, 5, 13, 46, 48, 4, 2, 52, 51, 11, 20, 18, 36, 42, 44, 15, 17, 35, 37, 22, 33, 34, 23, 32, 24, 25, 38, 26, 45, 27, 43, 28, 47, 49, 29, 30, 50, 41, 31, 53, 39, 40}},
@@ -529,14 +528,13 @@ CathodeSegmentation* createSegType0(bool isBendingPlane)
        /* 1NL */ {5, 18, {-1, -1, 9, 62, 7, -1, -1, 63, 60, 61, -1, -1, 8, 21, 19, -1, -1, 16, 59, 14, -1, -1, 56, 58, 57, -1, -1, 10, 12, 6, -1, -1, 55, 54, 5, -1, -1, 1, 2, 0, -1, -1, 3, 51, 52, -1, 4, 48, 46, 11, -1, 13, 42, 15, 44, -1, 18, 34, 20, 17, -1, 36, 33, 32, 35, -1, 22, 38, 25, 23, -1, 26, 29, 27, 24, 37, 47, 30, 49, 43, 45, 50, 41, 39, 28, -1, -1, 53, 40, 31}},
        /* 1NM */ {5, 15, {-1, 8, -1, -1, -1, -1, 60, 63, 9, 7, -1, 56, 16, 62, 61, -1, 10, 14, 19, 21, -1, 6, 57, 58, 59, -1, 1, 55, 54, 12, -1, 3, 52, 0, 5, -1, 4, 48, 51, 2, 46, 13, 15, 44, 11, 42, 18, 34, 36, 17, 37, 24, 22, 20, 35, 45, 27, 26, 32, 23, 30, 49, 29, 38, 33, 53, 31, 50, 28, 25, 41, 39, 40, 47, 43}},
        /* 1NN */ {5, 14, {8, 62, 63, 9, -1, 60, 21, 61, 7, -1, 58, 16, 59, 19, -1, 14, 57, 56, 12, -1, 10, 54, 6, 0, 5, 55, 1, 52, 2, 51, 3, 4, 48, 11, 46, 13, 15, 42, 44, 17, 36, 18, 20, 35, 23, 34, 33, 22, 32, 24, 37, 38, 26, 25, 43, 27, 45, 47, 28, 49, -1, 29, 30, 31, 53, -1, 50, 41, 40, 39}},
-       /* 1NG */
-       {16,
-        1,
-        {41, 50, 38, 26, 45, 47, 29, 30, 53, 27, 43, 28, 49, 31, 39, 40}},
-       /* 1NH */
-       {12, 1, {41, 50, 38, 26, 45, 47, 29, 30, 53, 27, 43, 28}}},
+       /* 1NG */ {16, 1, {41, 50, 38, 26, 45, 47, 29, 30, 53, 27, 43, 28, 49, 31, 39, 40}},
+       /* 1NH */ {12, 1, {41, 50, 38, 26, 45, 47, 29, 30, 53, 27, 43, 28}}},
       /* PS */
-      {{0.63, 0.42}, {0.63, 0.84}, {0.63, 1.68}, {0.63, 3.36}}};
+      {{0.63, 0.42},
+       {0.63, 0.84},
+       {0.63, 1.68},
+       {0.63, 3.36}}};
   }
 }
 class CathodeSegmentationCreatorRegisterCreateSegType0