external/InstallGeometry.cmake

-set(GEOMETRY_VERSION dbea68f7e26024e4fa937af4fd30295620497c4e)
+set(GEOMETRY_VERSION 5eca9e08e002d3dd411a09ee70cab7b5ecc38a20)
 
 set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
 

external/InstallInput.cmake

-set(INPUT_VERSION 6efc895ca8eedd4c05a2c8e808713f2727fbeeba)
+set(INPUT_VERSION 35c1dc7dd893b2da93c9404c60b82e84e8969d95)
 
 set(INPUT_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_input.git")
 

macro/rich/Import_GDML_Export_ROOT.c

 
+void addCopyNumbersToNodes(TGeoVolume* volume);
+
+
 void Import_GDML_Export_ROOT()
 {
 
@@ -94,6 +97,7 @@ void Import_GDML_Export_ROOT()
 
   gdmlTop->Print();
   gGeoManager->SetTopVolume(rootTop);
+  gGeoManager->SetAllIndex();
 
   // Starting from the version v18a position is defined inside the GDML file
   // Define your position HERE
@@ -103,6 +107,8 @@ void Import_GDML_Export_ROOT()
 
   rootTop->AddNode(gdmlTop, 1, posrot);
 
+  addCopyNumbersToNodes(gGeoManager->GetTopNode()->GetVolume());
+
   gGeoManager->CloseGeometry();
   gGeoManager->CheckOverlaps();
   gGeoManager->PrintOverlaps();
@@ -136,3 +142,21 @@ void Import_GDML_Export_ROOT()
   gROOT->LoadMacro(createmedialist);
   gROOT->ProcessLine("create_medialist(\"\", false)");
 }
+
+
+void addCopyNumbersToNodes(TGeoVolume* volume)
+{
+  map<string, int> counterMap;
+  TGeoIterator geoIterator(volume);
+  geoIterator.SetType(1);
+  geoIterator.Reset();
+  TGeoNode* curNode;
+  while ((curNode = geoIterator())) {
+    string volumeName = string(curNode->GetVolume()->GetName());
+    counterMap[volumeName]++;
+    int curCounter = counterMap[volumeName];
+    curNode->SetNumber(curCounter);
+    curNode->SetName((volumeName + "_" + to_string(curCounter)).c_str());
+    addCopyNumbersToNodes(curNode->GetVolume());
+  }
+}

macro/rich/geotest/run_one.py

@@ -16,9 +16,12 @@ def main():
   resultDir = "results_" + runId + "_"+ energy +"/" 
   
   #runId = "0"
-  geoSetup = "sis100_electron"
-  nEvents = 1000
-  testType = "urqmdTest" # urqmdTest or geoTest
+  geoSetup = "sis100_electron_APR21"
+  nEvents = 10
+  testType = "geoTest" # urqmdTest or geoTest
+
+  if testType == "geoTest":
+    urqmdFile = ""
 
   traFile = dataDir + "/tra." + runId + ".root"  
   parFile = dataDir + "/param." + runId + ".root"
@@ -32,9 +35,9 @@ def main():
   recoCmd = ('root -l -b -q run_reco.C\(\\"{}\\",\\"{}\\",\\"{}\\",\\"{}\\",\\"{}\\",\\"{}\\",{}\)').format(testType, traFile, parFile, digiFile, recoFile, geoSetup, nEvents)
   qaCmd = ('root -l -b -q run_qa.C\(\\"{}\\",\\"{}\\",\\"{}\\",\\"{}\\",\\"{}\\",\\"{}\\",\\"{}\\",\\"{}\\",{}\)').format(testType, traFile, parFile, digiFile, recoFile, qaFile, geoSetup, resultDir, nEvents)
 
-  # os.system((". /{} -a; {}").format(cbmrootConfigPath, traCmd))
-  # os.system((". /{} -a; {}").format(cbmrootConfigPath, digiCmd))
-  # os.system((". /{} -a; {}").format(cbmrootConfigPath, recoCmd))
+  os.system((". /{} -a; {}").format(cbmrootConfigPath, traCmd))
+  os.system((". /{} -a; {}").format(cbmrootConfigPath, digiCmd))
+  os.system((". /{} -a; {}").format(cbmrootConfigPath, recoCmd))
   os.system((". /{} -a; {}").format(cbmrootConfigPath, qaCmd))
 
 # def make_args():

reco/KF/CbmKFParticleInterface.cxx

@@ -162,6 +162,7 @@ void CbmKFParticleInterface::ExtrapolateTrackToPV(const CbmStsTrack* track, CbmV
   CbmL1PFFitter fitter;
   vector<float> vChiToPrimVtx;
   CbmKFVertex kfVertex;
+  assert(pv);
   if (pv) kfVertex = CbmKFVertex(*pv);
 
   vector<L1FieldRegion> vField;

reco/L1/L1Algo/L1Algo.h

@@ -214,8 +214,8 @@ public:
   alignas(16) std::array<L1Station, L1Parameters::kMaxNstations> fStationsNew;
   L1Vector<L1Material> fRadThick {"fRadThick"};        // material for each station
 
-  int NStsStrips {0};                   // number of strips
-  L1Vector<L1Hit>* vStsHits {nullptr};  // hits as a combination of front-, backstrips and z-position
+  int NStsStrips {0};                         // number of strips
+  L1Vector<L1Hit>* vStsHits {nullptr};        // hits as a combination of front-, backstrips and z-position
   L1Grid vGrid[L1Parameters::kMaxNstations];  // hits as a combination of front-, backstrips and z-position
   L1Grid vGridTime[L1Parameters::kMaxNstations];
 
@@ -368,6 +368,8 @@ public:
   //       the L1Algo instance. (S.Zh.)
   L1InitManager* GetL1InitManager() { return &fInitManager; }
 
+  fvec GetCbmTargetZ() const { return fCbmTargetZ; }
+
 private:
   /// Object containing L1Parameters. Default consturctor is used
   L1Parameters fL1Parameters;  ///< Object of L1Algo parameters class
@@ -568,7 +570,6 @@ private:
   void FilterFirstL(L1TrackParFit& track, fvec& x, fvec& y, fvec& t, fvec& t_er, L1Station& st, fvec& dx, fvec& dy,
                     fvec& dxy);
 
-
 #ifdef TBB
   enum
   {

reco/L1/ParticleFinder/CbmL1PFFitter.cxx

@@ -483,7 +483,7 @@ void CbmL1PFFitter::GetChiToVertex(vector<CbmStsTrack>& Tracks, vector<L1FieldRe
     }
 
     fB[0]     = CbmL1::Instance()->algo->GetVtxFieldValue();
-    zField[0] = 0;
+    zField[0] = CbmL1::Instance()->algo->GetCbmTargetZ();
     fld.Set(fB[2], zField[2], fB[1], zField[1], fB[0], zField[0]);
     field.push_back(fld);
 
@@ -623,7 +623,7 @@ void CbmL1PFFitter::CalculateFieldRegion(vector<CbmStsTrack>& Tracks, vector<L1F
     }
 
     fB[0]     = CbmL1::Instance()->algo->GetVtxFieldValue();
-    zField[0] = 0;
+    zField[0] = CbmL1::Instance()->algo->GetCbmTargetZ();
     fld.Set(fB[2], zField[2], fB[1], zField[1], fB[0], zField[0]);
     field.push_back(fld);
   }

reco/detectors/rich/CbmRichReconstruction.cxx

@@ -30,6 +30,7 @@
 #include "CbmEvent.h"
 #include "CbmGlobalTrack.h"
 #include "CbmRichConverter.h"
+#include "CbmRichGeoManager.h"
 #include "CbmRichRingFitterCOP.h"
 #include "CbmRichRingFitterCircle.h"
 #include "CbmRichRingFitterEllipseMinuit.h"
@@ -92,6 +93,17 @@ InitStatus CbmRichReconstruction::Init()
   fRichRings = new TClonesArray("CbmRichRing", 100);
   manager->Register("RichRing", "RICH", fRichRings, IsOutputBranchPersistent("RichRing"));
 
+  // This was checked for v17a, v21a geometries. The offset was chosen that
+  // the value for v17a is 260 cm and the value for v21a is 220 cm
+  double offset        = 205.7331;
+  fZTrackExtrapolation = CbmRichGeoManager::GetInstance().fGP->fMirrorZ + offset;
+  LOG(info) << "CbmRichReconstruction::Init() fZTrackExtrapolation = " << fZTrackExtrapolation;
+  if (fZTrackExtrapolation < 200. || fZTrackExtrapolation > 300.) {
+    LOG(fatal) << "CbmRichReconstruction::Init() fZTrackExtrapolation = " << fZTrackExtrapolation
+               << " The value of fZTrackExtrapolation is not correct. It must be in the range [200, 300] cm."
+               << " Probably the RICH geometry is not correct or it is not supported.";
+  }
+
   if (fRunExtrapolation) InitExtrapolation();
   if (fRunProjection) InitProjection();
   if (fRunFinder) InitFinder();

reco/detectors/rich/CbmRichReconstruction.h

@@ -133,7 +133,8 @@ private:
   string fTrackAssignName   = "closest_distance";
 
   // Z coordinate where STS tracks will be extrapolated.
-  Double_t fZTrackExtrapolation = 260.;
+  // Initialized later using geometry.
+  Double_t fZTrackExtrapolation = -1;  //260.
 
   /**
     * \brief