study

Signed-off-by: Felix Schlepper <[email protected]>

Author: f3sch

Detectors/Upgrades/ITS3/study/src/TrackingStudy.cxx

@@ -154,6 +154,7 @@ void TrackingStudySpec::updateTimeDependentParams(ProcessingContext& pc)
     initOnceDone = true;
     auto grp = o2::base::GRPGeomHelper::instance().getGRPECS();
     mVertexer.init();
+    o2::its::GeometryTGeo::Instance()->fillMatrixCache(o2::math_utils::bit2Mask(o2::math_utils::TransformType::T2L, o2::math_utils::TransformType::L2G, o2::math_utils::TransformType::T2G));
   }
 }
 
@@ -241,6 +242,9 @@ bool TrackingStudySpec::selectITSTrack(GTrackID trkID, o2::globaltracking::RecoC
         return false;
       }
     }
+    if (contributorsGID[GTrackID::TRD].isIndexSet()) {
+      // TODO
+    }
     if (contributorsGID[GTrackID::TOF].isIndexSet()) {
       const auto& tofLbls = recoData.getTOFClustersMCLabels()->getLabels(contributorsGID[GTrackID::TOF]);
       for (const auto& lbl : tofLbls) {
@@ -541,7 +545,6 @@ void TrackingStudySpec::doPullStudy(o2::globaltracking::RecoContainer& recoData)
   int nPulls{0}, nPullsFail{0};
   auto prop = o2::base::Propagator::Instance();
   const auto& conf = ITS3TrackingStudyParam::Instance();
-  const auto geomITS = o2::its::GeometryTGeo::Instance();
   auto pvvec = recoData.getPrimaryVertices();
   auto t2v = buildT2V(recoData, true, true);
 
@@ -581,12 +584,12 @@ void TrackingStudySpec::doPullStudy(o2::globaltracking::RecoContainer& recoData)
     clArr[0].setSigmaZ2(pv.getSigmaZ2());
     clAlpha[0] = trkPV.getAlpha();
     for (int icl = 0; icl < ncl; ++icl) { // ITS clusters are referred in layer decreasing order
-      clArr[icl + 1] = itsClusters[itsTrackClusRefs[clEntry + ncl - icl]];
-      clAlpha[icl + 1] = geomITS->getSensorRefAlpha(clArr[icl + 1].getSensorID());
+      clArr[ncl - icl] = itsClusters[itsTrackClusRefs[clEntry + icl]];
+      clAlpha[ncl - icl] = o2::its::GeometryTGeo::Instance()->getSensorRefAlpha(clArr[ncl - icl].getSensorID());
     }
     // start refit
     trFit = trkOut;
-    trFit.resetCovariance(10000);
+    trFit.resetCovariance(1'000);
     float chi2{0};
     for (int icl = ncl; icl >= 0; --icl) { // go backwards
       if (!trFit.rotate(clAlpha[icl]) || !prop->propagateToX(trFit, clArr[icl].getX(), prop->getNominalBz(), 0.85, 2.0, matCorr)) {
@@ -599,7 +602,8 @@ void TrackingStudySpec::doPullStudy(o2::globaltracking::RecoContainer& recoData)
         return false;
       }
     }
-    return chi2 < conf.maxChi2;
+    // chi2 < conf.maxChi2; should I cut here?
+    return true;
   };
 
   auto checkInTrack = [&](GTrackID trkID) {
@@ -674,7 +678,6 @@ void TrackingStudySpec::doMCStudy(o2::globaltracking::RecoContainer& recoData)
   sw.Start();
   int nTracks{0};
 
-  const auto geom = o2::its::GeometryTGeo::Instance();
   const int iSrc{0};
   const int nev = mcReader.getNEvents(iSrc);
   std::unordered_map<o2::MCCompLabel, ParticleInfoExt> info;
@@ -710,7 +713,7 @@ void TrackingStudySpec::doMCStudy(o2::globaltracking::RecoContainer& recoData)
       bool fake = false;
       lab.get(trackID, evID, srcID, fake);
       auto& cluster = clusters[iCluster];
-      auto layer = geom->getLayer(cluster.getSensorID());
+      auto layer = o2::its::GeometryTGeo::Instance()->getLayer(cluster.getSensorID());
       auto& part = info[{trackID, evID, srcID}];
       part.clusters |= (1 << layer);
       if (fake) {

Detectors/Upgrades/ITS3/study/src/its3-tracking-study-workflow.cxx

@@ -38,7 +38,7 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
   std::vector<o2::framework::ConfigParamSpec> options{
     {"disable-mc", o2::framework::VariantType::Bool, false, {"disable MC propagation"}},
     {"track-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of track sources to use"}},
-    {"cluster-sources", VariantType::String, "ITS", {"comma-separated list of cluster sources to use"}},
+    {"cluster-sources", VariantType::String, "ITS,TRD,TOF", {"comma-separated list of cluster sources to use"}},
     {"disable-root-input", VariantType::Bool, false, {"disable root-files input reader"}},
     {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
   o2::raw::HBFUtilsInitializer::addConfigOption(options);