Sets DEC21 geometries as defaults.

Updates hash to bring setups from geometry repository. Removes
some automated shifts to target in the transport macros.

external/InstallGeometry.cmake

-set(GEOMETRY_VERSION 53266cad5da6c85d242d8ce4d87882b401a6eb8e)
+set(GEOMETRY_VERSION 41b97faa49d7a0d84e1d65ad5d4f1d4f5de3f53f)
 
 set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
 

macro/run/run_tra_beam.C

@@ -59,7 +59,7 @@
  **/
 void run_tra_beam(Int_t nEvents = 1, const char* species = "Au", Double_t beamP = 12., Double_t beamStartZ = -1.,
                   const char* output = "beam", const char* setup = "sis100_electron", ECbmEngine engine = kGeant3,
-                  int randomSeed = 0, Bool_t overwrite = kFALSE)
+                  int randomSeed = 0, Bool_t overwrite = kTRUE)
 {
 
   // --- Logger settings ----------------------------------------------------
@@ -138,16 +138,10 @@ void run_tra_beam(Int_t nEvents = 1, const char* species = "Au", Double_t beamP
   // ------------------------------------------------------------------------
 
   // -----  Target properties -----------------------------------------------
-  Double_t targetZpos = -40.0;
-  // The target position is at z=0 for the old coordinate system but is intended
-  // to be moved to -4cm in the DEC21 release. The global coordinate system will
-  // also shift from the old target position to the center of the magnet which
-  // is a net displacement of -40 cm. In terms of the new coordainte system
-  // the target is therefore to be at -44 cm. In order not to cause forgetting
-  // we will automate the shifting process for a short time, until the full move
-  // has been completed.
-  if (strstr(setup, "_APR21")) targetZpos = 0.0;
-  if (strstr(setup, "_DEC21")) targetZpos = -44.0;
+  Double_t targetZpos = -44.0;
+  // According to a Technical Board decision in April 2020, the target is
+  // moved upstream by 4cm. The target is therefore 44cm from the centre of
+  // the magnet.
   std::cout << "Target is at " << targetZpos << "cm from origin" << std::endl;
   // ------------------------------------------------------------------------
 

macro/run/run_tra_file.C

@@ -70,7 +70,7 @@
  **/
 void run_tra_file(const char* input = "", Int_t nEvents = 1, const char* output = "",
                   const char* setup = "sis100_electron", ECbmEngine engine = kGeant3, int randomSeed = 0,
-                  Bool_t overwrite = kFALSE)
+                  Bool_t overwrite = kTRUE)
 {
 
   // --- Logger settings ----------------------------------------------------
@@ -112,16 +112,8 @@ void run_tra_file(const char* input = "", Int_t nEvents = 1, const char* output
   Double_t targetThickness = 0.025;  // in cm
   Double_t targetDiameter  = 2.5;    // in cm
 
-  Double_t targetZpos = -40.0;
-  // The target position is at z=0 for the old coordinate system but is intended
-  // to be moved to -4cm in the DEC21 release. The global coordinate system will
-  // also shift from the old target position to the center of the magnet which
-  // is a net displacement of -40 cm. In terms of the new coordainte system
-  // the target is therefore to be at -44 cm. In order not to cause forgetting
-  // we will automate the shifting process for a short time, until the full move
-  // has been completed.
-  if (strstr(setup, "_APR21")) targetZpos = 0.0;
-  if (strstr(setup, "_DEC21")) targetZpos = -44.0;
+  Double_t targetZpos = -44.0;
+  // The target is at -44 cm from the centre of the magnet.
   std::cout << "Target is at " << targetZpos << "cm from origin" << std::endl;
   // ------------------------------------------------------------------------