diff --git a/macro/psd/fair/create_psdgeo.C b/macro/psd/fair/create_psdgeo.C
index c2c736b6bb2c34803aca7ff3cb38cb448fdba62b..1c148506c8ccb810b788a7762104a317cff02176 100644
--- a/macro/psd/fair/create_psdgeo.C
+++ b/macro/psd/fair/create_psdgeo.C
@@ -228,7 +228,7 @@ void create_psdgeo()
// ----- Write PSD volume and placement matrix to geometry file ---------
cout << endl;
TString geoFileName = "psd_";
- geoFileName = geoFileName + geoTag + ".geo.root";
+ geoFileName = geoFileName + geoTag + ".geo.root?reproducible";
psd->Export(geoFileName);
TFile* geoFile = new TFile(geoFileName, "UPDATE");
psdTrans->Write();
@@ -242,7 +242,7 @@ void create_psdgeo()
// ----- Write entire TGeoManager to file -------------------------------
TString geoManFileName = "psd_";
- geoManFileName = geoManFileName + geoTag + ".geoman.root";
+ geoManFileName = geoManFileName + geoTag + ".geoman.root?reproducible";
TFile* geoManFile = new TFile(geoManFileName, "RECREATE");
gGeoManager->Write();
geoManFile->Close();
diff --git a/macro/psd/fair/create_psdgeo_46modules.C b/macro/psd/fair/create_psdgeo_46modules.C
index 41494145d23d7cadf2638aeff006c3f294018849..af29695da22c0fa9592a534bc4aeca6819785f5a 100644
--- a/macro/psd/fair/create_psdgeo_46modules.C
+++ b/macro/psd/fair/create_psdgeo_46modules.C
@@ -292,7 +292,7 @@ void create_psdgeo_46modules()
// ----- Write PSD volume and placement matrix to geometry file ---------
cout << endl;
TString geoFileName = "psd_";
- geoFileName = geoFileName + geoTag + ".geo.root";
+ geoFileName = geoFileName + geoTag + ".geo.root?reproducible";
psd->Export(geoFileName);
TFile* geoFile = new TFile(geoFileName, "UPDATE");
psdTrans->Write();
@@ -306,7 +306,7 @@ void create_psdgeo_46modules()
// ----- Write entire TGeoManager to file -------------------------------
TString geoManFileName = "psd_";
- geoManFileName = geoManFileName + geoTag + ".geoman.root";
+ geoManFileName = geoManFileName + geoTag + ".geoman.root?reproducible";
TFile* geoManFile = new TFile(geoManFileName, "RECREATE");
gGeoManager->Write();
geoManFile->Close();
diff --git a/macro/psd/fair/create_psdgeo_52modules.C b/macro/psd/fair/create_psdgeo_52modules.C
index fc6e63b7c406200ce4c93a588d61ae3d7701bfb3..e1d76e223991385886b54097ae20fa75c203d545 100644
--- a/macro/psd/fair/create_psdgeo_52modules.C
+++ b/macro/psd/fair/create_psdgeo_52modules.C
@@ -294,7 +294,7 @@ void create_psdgeo_52modules()
// ----- Write PSD volume and placement matrix to geometry file ---------
cout << endl;
TString geoFileName = "psd_";
- geoFileName = geoFileName + geoTag + ".geo.root";
+ geoFileName = geoFileName + geoTag + ".geo.root?reproducible";
psd->Export(geoFileName);
TFile* geoFile = new TFile(geoFileName, "UPDATE");
psdTrans->Write();
@@ -308,7 +308,7 @@ void create_psdgeo_52modules()
// ----- Write entire TGeoManager to file -------------------------------
TString geoManFileName = "psd_";
- geoManFileName = geoManFileName + geoTag + ".geoman.root";
+ geoManFileName = geoManFileName + geoTag + ".geoman.root?reproducible";
TFile* geoManFile = new TFile(geoManFileName, "RECREATE");
gGeoManager->Write();
geoManFile->Close();
diff --git a/macro/psd/fair/create_psdgeo_ideal.C b/macro/psd/fair/create_psdgeo_ideal.C
index 63eb66745a75dfb8f0dce6eabbe7ce00e654e6a5..96f9bcde95a26af6dfb00103e4c5a6b6b8b8824b 100644
--- a/macro/psd/fair/create_psdgeo_ideal.C
+++ b/macro/psd/fair/create_psdgeo_ideal.C
@@ -240,7 +240,7 @@ void create_psdgeo_ideal(TString geoTag = "v22a")
// ----- Write PSD volume and placement matrix to geometry file ---------
cout << endl;
TString geoFileName = "psd_";
- geoFileName = geoFileName + geoTag + ".geo.root";
+ geoFileName = geoFileName + geoTag + ".geo.root?reproducible";
psd->Export(geoFileName);
TFile* geoFile = new TFile(geoFileName, "UPDATE");
psdTrans->Write();
@@ -254,7 +254,7 @@ void create_psdgeo_ideal(TString geoTag = "v22a")
// ----- Write entire TGeoManager to file -------------------------------
TString geoManFileName = "psd_";
- geoManFileName = geoManFileName + geoTag + ".geoman.root";
+ geoManFileName = geoManFileName + geoTag + ".geoman.root?reproducible";
TFile* geoManFile = new TFile(geoManFileName, "RECREATE");
gGeoManager->Write();
geoManFile->Close();
diff --git a/macro/psd/fair/create_psdgeo_with_hole.C b/macro/psd/fair/create_psdgeo_with_hole.C
index fbae74eb092bafa84e00f70cfbc0e435566f6cd5..7f4e8b40e9c3e48ef74f3bd5c63dfc32db2a3b98 100644
--- a/macro/psd/fair/create_psdgeo_with_hole.C
+++ b/macro/psd/fair/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 = "v23a")
+void create_psdgeo_with_hole(TString geoTag = "v24f")
{
// ----- Steering variables ---------------------------------------------
@@ -70,9 +70,18 @@ void create_psdgeo_with_hole(TString geoTag = "v23a")
psdZ = 1756;
psdRotY = 0.0;
holeSize = 20.;
+ comment = "This is the PSD parking position for no magnetic field. Or very large beam enery.";
+ }
+ else if (geoTag == "v24f") {
+ psdX = -2.47;
+ psdY = 0;
+ psdZ = 1010;
+ 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.";
}
+
const Double_t bigModuleSize = 20.; // Module size (cm)
const Int_t nModulesX = 8; // Number of modules in a row (x direction)
const Int_t nModulesY = 6; // Number of modules in a row (x direction)
@@ -304,7 +313,7 @@ void create_psdgeo_with_hole(TString geoTag = "v23a")
// ----- Write PSD volume and placement matrix to geometry file ---------
cout << endl;
TString geoFileName = "psd_";
- geoFileName = geoFileName + geoTag + ".geo.root";
+ geoFileName = geoFileName + geoTag + ".geo.root?reproducible";
psd->Export(geoFileName);
TFile* geoFile = new TFile(geoFileName, "UPDATE");
psdTrans->Write();
@@ -318,7 +327,7 @@ void create_psdgeo_with_hole(TString geoTag = "v23a")
// ----- Write entire TGeoManager to file -------------------------------
TString geoManFileName = "psd_";
- geoManFileName = geoManFileName + geoTag + ".geoman.root";
+ geoManFileName = geoManFileName + geoTag + ".geoman.root?reproducible";
TFile* geoManFile = new TFile(geoManFileName, "RECREATE");
gGeoManager->Write();
geoManFile->Close();
diff --git a/psd/psd_v24f.geo.info b/psd/psd_v24f.geo.info
new file mode 100644
index 0000000000000000000000000000000000000000..04ac30706a346d68c88c74f4fd0fdbecc97e431b
--- /dev/null
+++ b/psd/psd_v24f.geo.info
@@ -0,0 +1,23 @@
+PSD geometry v24f created with create_psdgeo_with_hole.C
+
+This is the PSD parking position for an out-of-the-way position to be used in hadron and muon setuos.
+
+Number of modules: 8 x 6
+Big module size: 20 cm x 20 cm
+PSD front plane center coordinates: (-2.47, 0, 1010) cm
+PSD rotation around y axis: 0 rad
+Side length of the square shaped hole in PSD center: 20 cm
+
+Parameters of module module2060:
+Size: 20 cm x 20 cm
+Number of layers: 60
+Thickness of lead layers: 1.6 cm
+Thickness of scintillators: 0.4 cm
+Thickness of Tyvek wrap: 0.02 cm
+Thickness of iron box: (0.15 / 0.05 / 2) cm
+Height of fibre channel: 0.2 cm
+Distance of channel from edges: left 0.5 cm, right 2 cm
+
+PSD size is 160 cm x 120 cm x 140.8 cm
+PSD contains 44 modules.
+PSD volume center coordinates: (-2.47, 0, 1080.4) cm
diff --git a/psd/psd_v24f.geo.root b/psd/psd_v24f.geo.root
new file mode 100644
index 0000000000000000000000000000000000000000..411847223bf99a43d1affe0d76fcfdf84299a208
Binary files /dev/null and b/psd/psd_v24f.geo.root differ