From 84094f3696b71e38b340cb874aadd4451bae359d Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Thu, 24 Feb 2022 09:18:22 +0100
Subject: [PATCH] Provides psd_v22c
PSD_v22c is the parking position for the psd to be used in the
hadron and muon setups.
---
macro/geometry/check_radlen.sh | 4 ++--
macro/psd/create_psdgeo_with_hole.C | 11 ++++++++++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/macro/geometry/check_radlen.sh b/macro/geometry/check_radlen.sh
index 5cc5d38f95..198e3eb585 100755
--- a/macro/geometry/check_radlen.sh
+++ b/macro/geometry/check_radlen.sh
@@ -4,7 +4,7 @@
echo "Scanning the geometry" $1
-root -l -b -q '$VMCWORKDIR/macro/geometry/scan_geometry.C("'$1'")' &>tmp
+root -l -b -q '$VMCWORKDIR/macro/geometry/scan_geometry.C("'$1'")' 1>tmp
ROOT_EXIT=$?;
if [ 0 -ne $ROOT_EXIT ]; then
@@ -53,7 +53,7 @@ variables=`echo "$line" | sed -e 's/eff//g' | sed -e 's/index/jndex/g' | sed -e
COUNT=$((COUNT+1));
- echo -e " \t $line"
+ echo " \t $line"
done < MATERIALS
diff --git a/macro/psd/create_psdgeo_with_hole.C b/macro/psd/create_psdgeo_with_hole.C
index 1253592234..41f70c4438 100644
--- a/macro/psd/create_psdgeo_with_hole.C
+++ b/macro/psd/create_psdgeo_with_hole.C
@@ -37,7 +37,7 @@ TGeoVolume* ConstructShield(const char* name, Double_t sizeXY, Double_t holesize
// ====== Main function =====
// ============================================================================
-void create_psdgeo_with_hole(TString geoTag = "v22a")
+void create_psdgeo_with_hole(TString geoTag = "v22c")
{
// ----- Steering variables ---------------------------------------------
@@ -64,12 +64,21 @@ void create_psdgeo_with_hole(TString geoTag = "v22a")
holeSize = 20.;
comment = "Position for Au beam at 3.3A GeV/c and 60% magnetic field strength (to fit beam dump)";
}
+ else if (geoTag == "v22c") {
+ psdX = -90;
+ psdY = -70;
+ psdZ = 1756;
+ psdRotY = 0.0;
+ holeSize = 20.;
+ comment = "This is the PSD parking position for an out-of-the-way position to be used in hadron and muon setuos.";
+ }
else if (geoTag == "v20c") {
psdX = 12.95;
psdY = 0.;
psdZ = 1010;
psdRotY = 0.0132;
holeSize = 20.;
+ comment = "This is a coordinate shifted version of v20a";
}
else if (geoTag == "v20a") {
psdX = 12.95;
--
GitLab