From 81a57e6fce71b3a7c5d018c38d06f29c7b849bf3 Mon Sep 17 00:00:00 2001
From: Adrien Matta <matta@lpccaen.in2p3.fr>
Date: Thu, 16 Jun 2022 11:33:44 +0200
Subject: [PATCH] * Fixing ISS compilation with G4 11
---
NPSimulation/Detectors/Iss/IssArray.cc | 890 ++++++++++++-------------
1 file changed, 416 insertions(+), 474 deletions(-)
diff --git a/NPSimulation/Detectors/Iss/IssArray.cc b/NPSimulation/Detectors/Iss/IssArray.cc
index 6862e922f..37e23a94e 100644
--- a/NPSimulation/Detectors/Iss/IssArray.cc
+++ b/NPSimulation/Detectors/Iss/IssArray.cc
@@ -6,7 +6,7 @@
*****************************************************************************/
/*****************************************************************************
-* Author: M. Labiche address: marc.labiche@stfc.ac.uk *
+ * Author: M. Labiche address: marc.labiche@stfc.ac.uk *
* *
* Creation Date : July 2019 *
* Last update : *
@@ -40,11 +40,11 @@
#include "Randomize.hh"
// For the magnetic field
-#include "MyMagneticField.hh"
-#include "G4FieldManager.hh"
-#include "G4TransportationManager.hh"
#include "G4ChordFinder.hh"
+#include "G4FieldManager.hh"
#include "G4MagIntegratorStepper.hh"
+#include "G4TransportationManager.hh"
+#include "MyMagneticField.hh"
// NPS
#include "CalorimeterScorers.hh"
@@ -76,19 +76,15 @@ using namespace ISS;
IssArray::IssArray() {
m_Event = new TIssData();
InitializeMaterial();
- // if using mask: m_StripScorer = 0;
+ // if using mask: m_StripScorer = 0;
m_BOXScorer = 0;
-
}
IssArray::~IssArray() {}
-
-
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void IssArray::AddTelescope(G4ThreeVector X1_Y1, G4ThreeVector X128_Y1,
- G4ThreeVector X1_Y128, G4ThreeVector X128_Y128,
- bool wSi) {
+void IssArray::AddTelescope(G4ThreeVector X1_Y1, G4ThreeVector X128_Y1, G4ThreeVector X1_Y128, G4ThreeVector X128_Y128,
+ bool wSi) {
m_DefinitionType.push_back(true);
m_X1_Y1.push_back(X1_Y1);
@@ -96,7 +92,6 @@ void IssArray::AddTelescope(G4ThreeVector X1_Y1, G4ThreeVector X128_Y1,
m_X1_Y128.push_back(X1_Y128);
m_X128_Y128.push_back(X128_Y128);
m_wSi.push_back(wSi);
-
m_R.push_back(0);
m_Theta.push_back(0);
@@ -106,9 +101,8 @@ void IssArray::AddTelescope(G4ThreeVector X1_Y1, G4ThreeVector X128_Y1,
m_beta_w.push_back(0);
}
-void IssArray::AddTelescope(G4double R, G4double Theta, G4double Phi,
- G4double beta_u, G4double beta_v, G4double beta_w,
- bool wSi) {
+void IssArray::AddTelescope(G4double R, G4double Theta, G4double Phi, G4double beta_u, G4double beta_v, G4double beta_w,
+ bool wSi) {
G4ThreeVector empty = G4ThreeVector(0, 0, 0);
m_DefinitionType.push_back(false);
@@ -121,7 +115,6 @@ void IssArray::AddTelescope(G4double R, G4double Theta, G4double Phi,
m_beta_w.push_back(beta_w);
m_wSi.push_back(wSi);
-
m_X1_Y1.push_back(empty);
m_X128_Y1.push_back(empty);
m_X1_Y128.push_back(empty);
@@ -129,11 +122,11 @@ void IssArray::AddTelescope(G4double R, G4double Theta, G4double Phi,
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void IssArray::VolumeMaker(G4int TelescopeNumber, G4double DetTgt, G4ThreeVector MMpos,
- G4RotationMatrix* MMrot, bool wSi, G4LogicalVolume* world) {
+void IssArray::VolumeMaker(G4int TelescopeNumber, G4double DetTgt, G4ThreeVector MMpos, G4RotationMatrix* MMrot,
+ bool wSi, G4LogicalVolume* world) {
- G4double NbrTelescopes = TelescopeNumber;
- G4String DetectorNumber;
+ G4double NbrTelescopes = TelescopeNumber;
+ G4String DetectorNumber;
std::ostringstream Number;
Number << NbrTelescopes;
DetectorNumber = Number.str();
@@ -146,262 +139,252 @@ void IssArray::VolumeMaker(G4int TelescopeNumber, G4double DetTgt, G4ThreeVector
// Mechanical structure to be included only once with the 1st helios module
//
- const char* ToMyGDML=NULL;
- G4String MyGDMLPath;
+ const char* ToMyGDML = NULL;
+ G4String MyGDMLPath;
- if(getenv("MyGDML"))
- {
- //const char* ToMyGDML= getenv("MyGDML"); // "/mnt/hgfs/Documents/NPhelisol/gdml/";
- MyGDMLPath= G4String(getenv("MyGDML"));
- }
+ if (getenv("MyGDML")) {
+ // const char* ToMyGDML= getenv("MyGDML"); // "/mnt/hgfs/Documents/NPhelisol/gdml/";
+ MyGDMLPath = G4String(getenv("MyGDML"));
+ }
- if(TelescopeNumber==1){
- //
- // Aluminium support plate (gdml)
- //
-
-
- if(MyGDMLPath){
-
- cout << "Construction using gdml files" << endl;
-
- m_gdmlparser.Read(MyGDMLPath+"/ISSNudePlate.gdml");
- G4LogicalVolume* m_LogicalAlPlate= m_gdmlparser.GetVolume("StructPlate");
-
-
- m_gdmlparser.Read(MyGDMLPath+"/ISSTarg.gdml");
- G4LogicalVolume* m_LogicalSupTarg= m_gdmlparser.GetVolume("StructTarg");
-
- m_gdmlparser.Read(MyGDMLPath+"/ISSDetStrut.gdml");
- G4LogicalVolume* m_LogicalSupDet= m_gdmlparser.GetVolume("StructDet");
-
-
-/* m_gdmlparser.Read("/mnt/hgfs/Documents/NPhelisol/gdml/ISSNudePlate.gdml");
- G4LogicalVolume* m_LogicalAlPlate= m_gdmlparser.GetVolume("StructPlate");
-
- m_gdmlparser.Read("/mnt/hgfs/Documents/NPhelisol/gdml/ISSTarg.gdml");
- G4LogicalVolume* m_LogicalSupTarg= m_gdmlparser.GetVolume("StructTarg");
-
- m_gdmlparser.Read("/mnt/hgfs/Documents/NPhelisol/gdml/ISSDetStrut.gdml");
- G4LogicalVolume* m_LogicalSupDet= m_gdmlparser.GetVolume("StructDet");
-*/
- m_LogicalAlPlate->SetVisAttributes(G4VisAttributes::Invisible); // set world of Al Plate invisible
- m_LogicalSupTarg->SetVisAttributes(G4VisAttributes::Invisible); // set world of Al Plate invisible
- m_LogicalSupDet->SetVisAttributes(G4VisAttributes::Invisible); // set world of Al Plate invisible
-
- //G4VisAttributes *TargVol = new G4VisAttributes(G4Colour(1.0, .5, .5));
- //TargVol->SetForceSolid(false);
- //m_LogicalSupTarg->SetVisAttributes(TargVol);
-
- //G4VisAttributes *SupDetVol = new G4VisAttributes(G4Colour(1.0, .5, .5));
- //SupDetVol->SetForceWireframe(false);
- //m_LogicalSupDet->SetVisAttributes(SupDetVol);
-
- G4RotationMatrix* RotY_DetSup = new G4RotationMatrix();
- RotY_DetSup->rotateY(180*deg);
-
- cout << "MMpos0: " << MMpos(0) << endl;
- cout << "MMpos1: " << MMpos(1) << endl;
- cout << "MMpos2: " << MMpos(2) << endl;
-
- if(DetTgt<0){ // ie: detector at backward angles
- new G4PVPlacement(0, G4ThreeVector(0., -353, 0.), m_LogicalAlPlate,"AlumPlate", world, false, 0 );
- new G4PVPlacement(0, G4ThreeVector(13.5, -200.+(27.830127-5.66), 87.910256-5.+4.), m_LogicalSupTarg,"SupTarg", world, false, 0 );
- new G4PVPlacement(0, G4ThreeVector(0., 0., -6.5+(DetTgt+100)), m_LogicalSupDet,"SupDet", world, false, 0 );
- }else // ie: detector at forward angle
- {
- new G4PVPlacement(RotY_DetSup, G4ThreeVector(0., -370., 0.), m_LogicalAlPlate,"AlumPlate", world, false, 0 );
- new G4PVPlacement(RotY_DetSup, G4ThreeVector(-13.5, -200.+(27.830127-5.66), -87.910256+5.-4.), m_LogicalSupTarg,"SupTarg", world, false, 0 );
-
- new G4PVPlacement(RotY_DetSup, G4ThreeVector(0., 0., 6.5+(DetTgt-100)), m_LogicalSupDet,"SupDet", world, false, 1 ); // for detecmm
- }
-
-/*
- new G4PVPlacement(0, G4ThreeVector(0., -370., 0.), m_LogicalAlPlate,"AlumPlate", world, false, 0 );
- new G4PVPlacement(0, G4ThreeVector(13.5, -200.+(27.830127-5.66), 87.910256-5.+4.), m_LogicalSupTarg,"SupTarg", world, false, 0 ); // for backward angles
- //new G4PVPlacement(RotY_DetSup, G4ThreeVector(0., -370., 0.), m_LogicalAlPlate,"AlumPlate", world, false, 0 ); // for forward angles
- //new G4PVPlacement(RotY_DetSup, G4ThreeVector(-13.5, -200.+(27.830127-5.66), -87.910256+5.-4.), m_LogicalSupTarg,"SupTarg", world, false, 0 ); // for forward angles
-
- //new G4PVPlacement(0, G4ThreeVector(0., 0., -156.5), m_LogicalSupDet,"SupDet", world, false, 0 ); // for detector at -250mm
- //new G4PVPlacement(0, G4ThreeVector(0., 0., -6.5), m_LogicalSupDet,"SupDet", world, false, 0 ); // for detector at -100mm
- new G4PVPlacement(0, G4ThreeVector(0., 0., -26.5), m_LogicalSupDet,"SupDet", world, false, 0 ); // for detector at -120mm
- //new G4PVPlacement(0, G4ThreeVector(0., 0., -106.5), m_LogicalSupDet,"SupDet", world, false, 0 ); // for detector at -200mm
- //new G4PVPlacement(RotY_DetSup, G4ThreeVector(0., 0., 156.5), m_LogicalSupDet,"SupDet", world, false, 1 ); // for detector at 156.5mm
- //new G4PVPlacement(RotY_DetSup, G4ThreeVector(0., 0., 36.5), m_LogicalSupDet,"SupDet", world, false, 1 ); // for detector at 130.mm
-
-*/
-
- }else
- {
-
- //
- // Detector support structure (rods)
- //
-
- cout << "Construction without gdml files" << endl;
- cout << "to add gdml geometry files, make sure the environment variable MyGDML in nptool.sh or .csh point to your gdml directory " << endl;
-
-
- // Add the Aluminium rod
+ if (TelescopeNumber == 1) {
+ //
+ // Aluminium support plate (gdml)
+ //
- G4double RodTgt;
+ if (MyGDMLPath) {
- if(DetTgt<0)RodTgt=-10-DetTgt;
- if(DetTgt>0)RodTgt=-10+DetTgt;
-
- const G4double Zplan[2]={(RodTgt), (RodTgt+530)};
- //const G4double Zplan[2]={140*mm, 670*mm}; // if first silicons are at 150mm to target (helisol.detector)
- //const G4double Zplan[2]={90*mm, 620*mm}; // if first silicon at 100mm to target (helisol_2.detector)
- //const G4double Zplan[2]={40*mm, 570*mm}; // if first silicon at 50mm to target (helisol_3.detector)
- const G4double Rinner[2]={15*mm, 15*mm};
- const G4double Router[2]={24*mm, 24*mm};
- G4Polyhedra* Al_rod= new G4Polyhedra("Al_rod", 0., 360*deg, 6, 2, Zplan, Rinner, Router);
-
- G4LogicalVolume* Al_rod_log = new G4LogicalVolume(Al_rod, m_MaterialAluminium, "Al_rod", 0, 0, 0);
-
- G4RotationMatrix* RotZ30Y180 = new G4RotationMatrix();
- RotZ30Y180->rotateY(180*deg);
- RotZ30Y180->rotateZ(30*deg);
- G4RotationMatrix* RotZ30 = new G4RotationMatrix();
- RotZ30->rotateZ(30*deg);
-
-
- if(DetTgt<0){
- new G4PVPlacement(RotZ30Y180, G4ThreeVector(0.,0., 0.), Al_rod_log, "Al_rod", world, false, 1); // backward
- }else
- {
- new G4PVPlacement(RotZ30, G4ThreeVector(0.,0., 0.), Al_rod_log, "Al_rod", world, false, 1); // forward
- }
-
- //new G4PVPlacement(RotZ30, G4ThreeVector(0.,0., 100., Al_rod_log, "Al_rod", world, false, 0); // forward
- //new G4PVPlacement(RotZ30Y180, G4ThreeVector(0.,0., -150.), Al_rod_log, "Al_rod", world, false, 1); // backward
+ cout << "Construction using gdml files" << endl;
+ m_gdmlparser.Read(MyGDMLPath + "/ISSNudePlate.gdml");
+ G4LogicalVolume* m_LogicalAlPlate = m_gdmlparser.GetVolume("StructPlate");
- G4VisAttributes* VisAtt1 = new G4VisAttributes(G4Colour(1, 0.8, 0));
- Al_rod_log->SetVisAttributes(VisAtt1);
+ m_gdmlparser.Read(MyGDMLPath + "/ISSTarg.gdml");
+ G4LogicalVolume* m_LogicalSupTarg = m_gdmlparser.GetVolume("StructTarg");
- }
+ m_gdmlparser.Read(MyGDMLPath + "/ISSDetStrut.gdml");
+ G4LogicalVolume* m_LogicalSupDet = m_gdmlparser.GetVolume("StructDet");
+ /* m_gdmlparser.Read("/mnt/hgfs/Documents/NPhelisol/gdml/ISSNudePlate.gdml");
+ G4LogicalVolume* m_LogicalAlPlate= m_gdmlparser.GetVolume("StructPlate");
- //
- // Add the Aluminium chamber
- //
- G4double Al_chamber_rmin = 50. * cm;
- G4double Al_chamber_rmax = 50.5 * cm;
- G4double Al_chamber_z = 150.0 * cm;
-
- //G4Tubs* Al_chamber_tub
- // = new G4Tubs("Al_chamber_tub", Al_chamber_rmin, Al_chamber_rmax, Al_chamber_z, 0.*deg, 180*deg);
- G4Tubs* Al_chamber_tub
- = new G4Tubs("Al_chamber_tub", Al_chamber_rmin, Al_chamber_rmax, Al_chamber_z, 0.*deg, 240*deg);
-
- G4LogicalVolume* Al_chamber_log = new G4LogicalVolume(Al_chamber_tub, m_MaterialAluminium, "Al_chamber", 0, 0, 0);
-
- G4RotationMatrix* RotZ = new G4RotationMatrix();
- RotZ->rotateZ(-90*deg);
-
- new G4PVPlacement(RotZ, G4ThreeVector(0.,0.,0.), Al_chamber_log, "Al_chamber", world, false, 0);
-
-
- G4VisAttributes* VisAtt2 = new G4VisAttributes(G4Colour(0, 0.8, 0.5));
- //VisAtt2->SetForceWireframe("True");
- Al_chamber_log->SetVisAttributes(VisAtt2);
+ m_gdmlparser.Read("/mnt/hgfs/Documents/NPhelisol/gdml/ISSTarg.gdml");
+ G4LogicalVolume* m_LogicalSupTarg= m_gdmlparser.GetVolume("StructTarg");
+
+ m_gdmlparser.Read("/mnt/hgfs/Documents/NPhelisol/gdml/ISSDetStrut.gdml");
+ G4LogicalVolume* m_LogicalSupDet= m_gdmlparser.GetVolume("StructDet");
+ */
+ m_LogicalAlPlate->SetVisAttributes(G4VisAttributes::GetInvisible()); // set world of Al Plate invisible
+ m_LogicalSupTarg->SetVisAttributes(G4VisAttributes::GetInvisible()); // set world of Al Plate invisible
+ m_LogicalSupDet->SetVisAttributes(G4VisAttributes::GetInvisible()); // set world of Al Plate invisible
+
+ // G4VisAttributes *TargVol = new G4VisAttributes(G4Colour(1.0, .5, .5));
+ // TargVol->SetForceSolid(false);
+ // m_LogicalSupTarg->SetVisAttributes(TargVol);
+
+ // G4VisAttributes *SupDetVol = new G4VisAttributes(G4Colour(1.0, .5, .5));
+ // SupDetVol->SetForceWireframe(false);
+ // m_LogicalSupDet->SetVisAttributes(SupDetVol);
+
+ G4RotationMatrix* RotY_DetSup = new G4RotationMatrix();
+ RotY_DetSup->rotateY(180 * deg);
+
+ cout << "MMpos0: " << MMpos(0) << endl;
+ cout << "MMpos1: " << MMpos(1) << endl;
+ cout << "MMpos2: " << MMpos(2) << endl;
+
+ if (DetTgt < 0) { // ie: detector at backward angles
+ new G4PVPlacement(0, G4ThreeVector(0., -353, 0.), m_LogicalAlPlate, "AlumPlate", world, false, 0);
+ new G4PVPlacement(0, G4ThreeVector(13.5, -200. + (27.830127 - 5.66), 87.910256 - 5. + 4.), m_LogicalSupTarg,
+ "SupTarg", world, false, 0);
+ new G4PVPlacement(0, G4ThreeVector(0., 0., -6.5 + (DetTgt + 100)), m_LogicalSupDet, "SupDet", world, false, 0);
+ }
+ else // ie: detector at forward angle
+ {
+ new G4PVPlacement(RotY_DetSup, G4ThreeVector(0., -370., 0.), m_LogicalAlPlate, "AlumPlate", world, false, 0);
+ new G4PVPlacement(RotY_DetSup, G4ThreeVector(-13.5, -200. + (27.830127 - 5.66), -87.910256 + 5. - 4.),
+ m_LogicalSupTarg, "SupTarg", world, false, 0);
+
+ new G4PVPlacement(RotY_DetSup, G4ThreeVector(0., 0., 6.5 + (DetTgt - 100)), m_LogicalSupDet, "SupDet", world,
+ false, 1); // for detecmm
+ }
+
+ /*
+ new G4PVPlacement(0, G4ThreeVector(0., -370., 0.), m_LogicalAlPlate,"AlumPlate", world, false, 0 );
+ new G4PVPlacement(0, G4ThreeVector(13.5, -200.+(27.830127-5.66), 87.910256-5.+4.),
+ m_LogicalSupTarg,"SupTarg", world, false, 0 ); // for backward angles
+ //new G4PVPlacement(RotY_DetSup, G4ThreeVector(0., -370., 0.), m_LogicalAlPlate,"AlumPlate", world, false,
+ 0 ); // for forward angles
+ //new G4PVPlacement(RotY_DetSup, G4ThreeVector(-13.5, -200.+(27.830127-5.66), -87.910256+5.-4.),
+ m_LogicalSupTarg,"SupTarg", world, false, 0 ); // for forward angles
+
+ //new G4PVPlacement(0, G4ThreeVector(0., 0., -156.5), m_LogicalSupDet,"SupDet", world, false, 0 ); // for
+ detector at -250mm
+ //new G4PVPlacement(0, G4ThreeVector(0., 0., -6.5), m_LogicalSupDet,"SupDet", world, false, 0 ); // for
+ detector at -100mm new G4PVPlacement(0, G4ThreeVector(0., 0., -26.5), m_LogicalSupDet,"SupDet", world, false,
+ 0 ); // for detector at -120mm
+ //new G4PVPlacement(0, G4ThreeVector(0., 0., -106.5), m_LogicalSupDet,"SupDet", world, false, 0 ); // for
+ detector at -200mm
+ //new G4PVPlacement(RotY_DetSup, G4ThreeVector(0., 0., 156.5), m_LogicalSupDet,"SupDet", world, false, 1
+ ); // for detector at 156.5mm
+ //new G4PVPlacement(RotY_DetSup, G4ThreeVector(0., 0., 36.5), m_LogicalSupDet,"SupDet", world, false, 1 );
+ // for detector at 130.mm
+
+ */
+ }
+ else {
//
- // Add the Aluminium shield after target to stop most shallow angle particles
+ // Detector support structure (rods)
//
- G4double Al_tgt_rmin = 0.03 * cm;
- G4double Al_tgt_rmax = 0.13 * cm;
- G4double Al_tgt_z = .05 * cm;
-
- G4Tubs* Al_tgt_shield
- = new G4Tubs("Al_tgt_shield", Al_tgt_rmin, Al_tgt_rmax, Al_tgt_z, 0.*deg, 360*deg);
-
- G4LogicalVolume* Al_tgt_log = new G4LogicalVolume(Al_tgt_shield, m_MaterialAluminium, "Al_tgt_shield", 0, 0, 0);
-
- //new G4PVPlacement(RotZ, G4ThreeVector(0.,0.,-0.2*cm), Al_tgt_log, "Al_tgt_shield", world, false, 0);
+ cout << "Construction without gdml files" << endl;
+ cout << "to add gdml geometry files, make sure the environment variable MyGDML in nptool.sh or .csh point to "
+ "your gdml directory "
+ << endl;
+
+ // Add the Aluminium rod
+
+ G4double RodTgt;
+
+ if (DetTgt < 0)
+ RodTgt = -10 - DetTgt;
+ if (DetTgt > 0)
+ RodTgt = -10 + DetTgt;
+
+ const G4double Zplan[2] = {(RodTgt), (RodTgt + 530)};
+ // const G4double Zplan[2]={140*mm, 670*mm}; // if first silicons are at 150mm to target (helisol.detector)
+ // const G4double Zplan[2]={90*mm, 620*mm}; // if first silicon at 100mm to target (helisol_2.detector)
+ // const G4double Zplan[2]={40*mm, 570*mm}; // if first silicon at 50mm to target (helisol_3.detector)
+ const G4double Rinner[2] = {15 * mm, 15 * mm};
+ const G4double Router[2] = {24 * mm, 24 * mm};
+ G4Polyhedra* Al_rod = new G4Polyhedra("Al_rod", 0., 360 * deg, 6, 2, Zplan, Rinner, Router);
+
+ G4LogicalVolume* Al_rod_log = new G4LogicalVolume(Al_rod, m_MaterialAluminium, "Al_rod", 0, 0, 0);
+
+ G4RotationMatrix* RotZ30Y180 = new G4RotationMatrix();
+ RotZ30Y180->rotateY(180 * deg);
+ RotZ30Y180->rotateZ(30 * deg);
+ G4RotationMatrix* RotZ30 = new G4RotationMatrix();
+ RotZ30->rotateZ(30 * deg);
+
+ if (DetTgt < 0) {
+ new G4PVPlacement(RotZ30Y180, G4ThreeVector(0., 0., 0.), Al_rod_log, "Al_rod", world, false, 1); // backward
+ }
+ else {
+ new G4PVPlacement(RotZ30, G4ThreeVector(0., 0., 0.), Al_rod_log, "Al_rod", world, false, 1); // forward
+ }
+
+ // new G4PVPlacement(RotZ30, G4ThreeVector(0.,0., 100., Al_rod_log, "Al_rod", world, false, 0); // forward
+ // new G4PVPlacement(RotZ30Y180, G4ThreeVector(0.,0., -150.), Al_rod_log, "Al_rod", world, false, 1); // backward
- } // endof of TelescopNumber==1
+ G4VisAttributes* VisAtt1 = new G4VisAttributes(G4Colour(1, 0.8, 0));
+ Al_rod_log->SetVisAttributes(VisAtt1);
+ }
+
+ //
+ // Add the Aluminium chamber
+ //
+ G4double Al_chamber_rmin = 50. * cm;
+ G4double Al_chamber_rmax = 50.5 * cm;
+ G4double Al_chamber_z = 150.0 * cm;
+
+ // G4Tubs* Al_chamber_tub
+ // = new G4Tubs("Al_chamber_tub", Al_chamber_rmin, Al_chamber_rmax, Al_chamber_z, 0.*deg, 180*deg);
+ G4Tubs* Al_chamber_tub =
+ new G4Tubs("Al_chamber_tub", Al_chamber_rmin, Al_chamber_rmax, Al_chamber_z, 0. * deg, 240 * deg);
+
+ G4LogicalVolume* Al_chamber_log = new G4LogicalVolume(Al_chamber_tub, m_MaterialAluminium, "Al_chamber", 0, 0, 0);
+ G4RotationMatrix* RotZ = new G4RotationMatrix();
+ RotZ->rotateZ(-90 * deg);
+ new G4PVPlacement(RotZ, G4ThreeVector(0., 0., 0.), Al_chamber_log, "Al_chamber", world, false, 0);
- ////////////////////////////////////////////////////////////////
- ///////////////// First & single Stage Construction /////////////////////
- ////////////////////////////////////////////////////////////////
+ G4VisAttributes* VisAtt2 = new G4VisAttributes(G4Colour(0, 0.8, 0.5));
+ // VisAtt2->SetForceWireframe("True");
+ Al_chamber_log->SetVisAttributes(VisAtt2);
- // Mother volume:
- G4Box* solidMM = new G4Box("ISSDet" + DetectorNumber, 0.5 * FaceLength, 0.5 * FaceWidth, 0.5 * Length);
- G4LogicalVolume* logicMM = new G4LogicalVolume(solidMM, m_MaterialVacuum, "ISSDet" + DetectorNumber, 0, 0, 0);
- G4String Name = "ISSDet" + DetectorNumber;
+ //
+ // Add the Aluminium shield after target to stop most shallow angle particles
+ //
+ G4double Al_tgt_rmin = 0.03 * cm;
+ G4double Al_tgt_rmax = 0.13 * cm;
+ G4double Al_tgt_z = .05 * cm;
- new G4PVPlacement(G4Transform3D(*MMrot, MMpos), logicMM, Name, world, false,TelescopeNumber);
+ G4Tubs* Al_tgt_shield = new G4Tubs("Al_tgt_shield", Al_tgt_rmin, Al_tgt_rmax, Al_tgt_z, 0. * deg, 360 * deg);
- if (m_non_sensitive_part_visiualisation) {
- G4VisAttributes* FrameVisAtt
- = new G4VisAttributes(G4Colour(0.80, 0.80, 0.80));
- FrameVisAtt->SetForceWireframe(true);
- logicMM->SetVisAttributes(FrameVisAtt);
- } else
- logicMM->SetVisAttributes(G4VisAttributes::Invisible);
+ G4LogicalVolume* Al_tgt_log = new G4LogicalVolume(Al_tgt_shield, m_MaterialAluminium, "Al_tgt_shield", 0, 0, 0);
- G4ThreeVector positionVacBox = G4ThreeVector(0, 0, VacBox_PosZ);
+ // new G4PVPlacement(RotZ, G4ThreeVector(0.,0.,-0.2*cm), Al_tgt_log, "Al_tgt_shield", world, false, 0);
- G4Box* solidVacBox
- = new G4Box("solidVacBox", 0.5 * SiliconFaceLength, 0.5 * SiliconFaceWidth, 0.5 * VacBoxThickness);
- G4LogicalVolume* logicVacBox = new G4LogicalVolume(solidVacBox, m_MaterialVacuum, "logicVacBox", 0, 0, 0);
+ } // endof of TelescopNumber==1
- new G4PVPlacement(0, positionVacBox, logicVacBox, Name + "_VacBox", logicMM,
- false, TelescopeNumber);
+ ////////////////////////////////////////////////////////////////
+ ///////////////// First & single Stage Construction /////////////////////
+ ////////////////////////////////////////////////////////////////
- logicVacBox->SetVisAttributes(G4VisAttributes::Invisible);
+ // Mother volume:
+ G4Box* solidMM = new G4Box("ISSDet" + DetectorNumber, 0.5 * FaceLength, 0.5 * FaceWidth, 0.5 * Length);
+ G4LogicalVolume* logicMM = new G4LogicalVolume(solidMM, m_MaterialVacuum, "ISSDet" + DetectorNumber, 0, 0, 0);
+ G4String Name = "ISSDet" + DetectorNumber;
- G4VisAttributes* SiliconVisAtt = new G4VisAttributes(G4Colour(0.3, 0.3, 0.3));
+ new G4PVPlacement(G4Transform3D(*MMrot, MMpos), logicMM, Name, world, false, TelescopeNumber);
- // Silicon:
- if (wSi) {
+ if (m_non_sensitive_part_visiualisation) {
+ G4VisAttributes* FrameVisAtt = new G4VisAttributes(G4Colour(0.80, 0.80, 0.80));
+ FrameVisAtt->SetForceWireframe(true);
+ logicMM->SetVisAttributes(FrameVisAtt);
+ }
+ else
+ logicMM->SetVisAttributes(G4VisAttributes::GetInvisible());
- //Aluminium layer
+ G4ThreeVector positionVacBox = G4ThreeVector(0, 0, VacBox_PosZ);
- G4ThreeVector positionAluStripFront
- = G4ThreeVector(0, 0, AluStripFront_PosZ);
- G4ThreeVector positionAluStripBack = G4ThreeVector(0, 0, AluStripBack_PosZ);
+ G4Box* solidVacBox = new G4Box("solidVacBox", 0.5 * SiliconFaceLength, 0.5 * SiliconFaceWidth, 0.5 * VacBoxThickness);
+ G4LogicalVolume* logicVacBox = new G4LogicalVolume(solidVacBox, m_MaterialVacuum, "logicVacBox", 0, 0, 0);
- G4Box* solidAluStrip
- = new G4Box("AluBox", 0.5 * SiliconFaceLength, 0.5 * SiliconFaceWidth,
- 0.5 * AluStripThickness);
- G4LogicalVolume* logicAluStrip = new G4LogicalVolume(
- solidAluStrip, m_MaterialAluminium, "logicAluStrip", 0, 0, 0);
+ new G4PVPlacement(0, positionVacBox, logicVacBox, Name + "_VacBox", logicMM, false, TelescopeNumber);
- new G4PVPlacement(0, positionAluStripFront, logicAluStrip,
- Name + "_AluStripFront", logicMM, false, TelescopeNumber);
- new G4PVPlacement(0, positionAluStripBack, logicAluStrip,
- Name + "_AluStripBack", logicMM, false, TelescopeNumber);
+ logicVacBox->SetVisAttributes(G4VisAttributes::GetInvisible());
- logicAluStrip->SetVisAttributes(G4VisAttributes::Invisible);
+ G4VisAttributes* SiliconVisAtt = new G4VisAttributes(G4Colour(0.3, 0.3, 0.3));
- // Silicon detector itself
+ // Silicon:
+ if (wSi) {
- G4ThreeVector positionSilicon = G4ThreeVector(0, 0, Silicon_PosZ);
+ // Aluminium layer
- G4Box* solidSilicon = new G4Box("solidSilicon", 0.5*SiliconFaceLength, 0.5*SiliconFaceWidth, 0.5*SiliconThickness);
- G4LogicalVolume* logicSilicon = new G4LogicalVolume(solidSilicon, m_MaterialSilicon, "logicSilicon", 0, 0, 0);
+ G4ThreeVector positionAluStripFront = G4ThreeVector(0, 0, AluStripFront_PosZ);
+ G4ThreeVector positionAluStripBack = G4ThreeVector(0, 0, AluStripBack_PosZ);
- new G4PVPlacement(0, positionSilicon, logicSilicon, Name + "_Silicon",
- logicMM, false, TelescopeNumber);
+ G4Box* solidAluStrip =
+ new G4Box("AluBox", 0.5 * SiliconFaceLength, 0.5 * SiliconFaceWidth, 0.5 * AluStripThickness);
+ G4LogicalVolume* logicAluStrip = new G4LogicalVolume(solidAluStrip, m_MaterialAluminium, "logicAluStrip", 0, 0, 0);
- /// Set Silicon strip sensible
- logicSilicon->SetSensitiveDetector(m_BOXScorer);
- // if using mask: logicSilicon->SetSensitiveDetector(m_StripScorer);
+ new G4PVPlacement(0, positionAluStripFront, logicAluStrip, Name + "_AluStripFront", logicMM, false,
+ TelescopeNumber);
+ new G4PVPlacement(0, positionAluStripBack, logicAluStrip, Name + "_AluStripBack", logicMM, false, TelescopeNumber);
- /// Visualisation of Silicon Strip
- logicSilicon->SetVisAttributes(SiliconVisAtt);
+ logicAluStrip->SetVisAttributes(G4VisAttributes::GetInvisible());
+ // Silicon detector itself
- }
+ G4ThreeVector positionSilicon = G4ThreeVector(0, 0, Silicon_PosZ);
+ G4Box* solidSilicon =
+ new G4Box("solidSilicon", 0.5 * SiliconFaceLength, 0.5 * SiliconFaceWidth, 0.5 * SiliconThickness);
+ G4LogicalVolume* logicSilicon = new G4LogicalVolume(solidSilicon, m_MaterialSilicon, "logicSilicon", 0, 0, 0);
-
+ new G4PVPlacement(0, positionSilicon, logicSilicon, Name + "_Silicon", logicMM, false, TelescopeNumber);
+
+ /// Set Silicon strip sensible
+ logicSilicon->SetSensitiveDetector(m_BOXScorer);
+ // if using mask: logicSilicon->SetSensitiveDetector(m_StripScorer);
+
+ /// Visualisation of Silicon Strip
+ logicSilicon->SetVisAttributes(SiliconVisAtt);
+ }
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -419,50 +402,42 @@ void IssArray::ReadConfiguration(NPL::InputParser parser) {
if (NPOptionManager::getInstance()->GetVerboseLevel())
cout << endl << "//// Iss det " << i + 1 << endl;
// Cartesian Case
- vector<string> cart
- = {"X1_Y1", "X1_Y128", "X128_Y1", "X128_Y128", "SI"};
+ vector<string> cart = {"X1_Y1", "X1_Y128", "X128_Y1", "X128_Y128", "SI"};
// Spherical Case
vector<string> sphe = {"R", "THETA", "PHI", "BETA", "SI"};
-
- if(blocks[i]->HasToken("MField")){
- double Bz=blocks[i]->GetDouble("MField","T");
- MyMagneticField* myField = new MyMagneticField(G4ThreeVector(0.,0.,Bz));
- G4FieldManager* fieldMgr= G4TransportationManager::GetTransportationManager()->GetFieldManager();
- fieldMgr->SetDetectorField(myField);
+ if (blocks[i]->HasToken("MField")) {
+ double Bz = blocks[i]->GetDouble("MField", "T");
+ MyMagneticField* myField = new MyMagneticField(G4ThreeVector(0., 0., Bz));
+ G4FieldManager* fieldMgr = G4TransportationManager::GetTransportationManager()->GetFieldManager();
+ fieldMgr->SetDetectorField(myField);
fieldMgr->CreateChordFinder(myField);
}
-
-
if (blocks[i]->HasTokenList(cart)) {
- G4ThreeVector A
- = NPS::ConvertVector(blocks[i]->GetTVector3("X1_Y1", "mm"));
- G4ThreeVector B
- = NPS::ConvertVector(blocks[i]->GetTVector3("X128_Y1", "mm"));
- G4ThreeVector C
- = NPS::ConvertVector(blocks[i]->GetTVector3("X1_Y128", "mm"));
- G4ThreeVector D
- = NPS::ConvertVector(blocks[i]->GetTVector3("X128_Y128", "mm"));
- int SI = blocks[i]->GetInt("SI");
+ G4ThreeVector A = NPS::ConvertVector(blocks[i]->GetTVector3("X1_Y1", "mm"));
+ G4ThreeVector B = NPS::ConvertVector(blocks[i]->GetTVector3("X128_Y1", "mm"));
+ G4ThreeVector C = NPS::ConvertVector(blocks[i]->GetTVector3("X1_Y128", "mm"));
+ G4ThreeVector D = NPS::ConvertVector(blocks[i]->GetTVector3("X128_Y128", "mm"));
+ int SI = blocks[i]->GetInt("SI");
AddTelescope(A, B, C, D, SI == 1);
}
else if (blocks[i]->HasTokenList(sphe)) {
- double Theta = blocks[i]->GetDouble("THETA", "deg");
- double Phi = blocks[i]->GetDouble("PHI", "deg");
- double R = blocks[i]->GetDouble("R", "mm");
- vector<double> beta = blocks[i]->GetVectorDouble("BETA", "deg");
- int SI = blocks[i]->GetInt("SI");
+ double Theta = blocks[i]->GetDouble("THETA", "deg");
+ double Phi = blocks[i]->GetDouble("PHI", "deg");
+ double R = blocks[i]->GetDouble("R", "mm");
+ vector<double> beta = blocks[i]->GetVectorDouble("BETA", "deg");
+ int SI = blocks[i]->GetInt("SI");
AddTelescope(R, Theta, Phi, beta[0], beta[1], beta[2], SI == 1);
}
else {
cout << "WARNING: Missing token for ISSDet blocks, check your input "
- "file"
- << endl;
+ "file"
+ << endl;
exit(1);
}
@@ -474,22 +449,22 @@ void IssArray::ReadConfiguration(NPL::InputParser parser) {
// Construct detector and inialise sensitive part.
// Called After DetecorConstruction::AddDetector Method
void IssArray::ConstructDetector(G4LogicalVolume* world) {
- G4RotationMatrix* MMrot = NULL;
- G4ThreeVector MMpos = G4ThreeVector(0, 0, 0);
- G4ThreeVector MMu = G4ThreeVector(0, 0, 0);
- G4ThreeVector MMv = G4ThreeVector(0, 0, 0);
- G4ThreeVector MMw = G4ThreeVector(0, 0, 0);
- G4ThreeVector MMCenter = G4ThreeVector(0, 0, 0);
- G4double DetTgt = 0;
- bool Si = true;
+ G4RotationMatrix* MMrot = NULL;
+ G4ThreeVector MMpos = G4ThreeVector(0, 0, 0);
+ G4ThreeVector MMu = G4ThreeVector(0, 0, 0);
+ G4ThreeVector MMv = G4ThreeVector(0, 0, 0);
+ G4ThreeVector MMw = G4ThreeVector(0, 0, 0);
+ G4ThreeVector MMCenter = G4ThreeVector(0, 0, 0);
+ G4double DetTgt = 0;
+ bool Si = true;
G4int NumberOfTelescope = m_DefinitionType.size();
for (G4int i = 0; i < NumberOfTelescope; i++) {
- if(i==0){ // first telescope found
- MMu=m_X1_Y1[i];
- DetTgt=MMu(2);
+ if (i == 0) { // first telescope found
+ MMu = m_X1_Y1[i];
+ DetTgt = MMu(2);
}
// By Point
@@ -507,8 +482,7 @@ void IssArray::ConstructDetector(G4LogicalVolume* world) {
// if (MMw.z() > 0)MMw = MMv.cross(MMu) ;
MMw = MMw.unit();
- MMCenter
- = (m_X1_Y1[i] + m_X1_Y128[i] + m_X128_Y1[i] + m_X128_Y128[i]) / 4;
+ MMCenter = (m_X1_Y1[i] + m_X1_Y128[i] + m_X128_Y1[i] + m_X128_Y128[i]) / 4;
// Passage Matrix from Lab Referential to Telescope Referential
MMrot = new G4RotationMatrix(MMv, MMu, MMw);
@@ -518,7 +492,7 @@ void IssArray::ConstructDetector(G4LogicalVolume* world) {
// By Angle
else {
G4double Theta = m_Theta[i];
- G4double Phi = m_Phi[i];
+ G4double Phi = m_Phi[i];
// (u,v,w) unitary vector associated to telescope referencial
// (u,v) // to silicon plan
@@ -528,16 +502,16 @@ void IssArray::ConstructDetector(G4LogicalVolume* world) {
G4double wX = m_R[i] * sin(Theta / rad) * cos(Phi / rad);
G4double wY = m_R[i] * sin(Theta / rad) * sin(Phi / rad);
G4double wZ = m_R[i] * cos(Theta / rad);
- MMw = G4ThreeVector(wX, wY, wZ);
+ MMw = G4ThreeVector(wX, wY, wZ);
// vector corresponding to the center of the module
G4ThreeVector CT = MMw;
// vector parallel to one axis of silicon plane
- G4double ii = cos(Theta / rad) * cos(Phi / rad);
- G4double jj = cos(Theta / rad) * sin(Phi / rad);
- G4double kk = -sin(Theta / rad);
- G4ThreeVector Y = G4ThreeVector(ii, jj, kk);
+ G4double ii = cos(Theta / rad) * cos(Phi / rad);
+ G4double jj = cos(Theta / rad) * sin(Phi / rad);
+ G4double kk = -sin(Theta / rad);
+ G4ThreeVector Y = G4ThreeVector(ii, jj, kk);
MMw = MMw.unit();
MMu = MMw.cross(Y);
@@ -556,7 +530,7 @@ void IssArray::ConstructDetector(G4LogicalVolume* world) {
MMpos = MMw * Length * 0.5 + CT;
}
- Si = m_wSi[i];
+ Si = m_wSi[i];
VolumeMaker(i + 1, DetTgt, MMpos, MMrot, Si, world);
}
@@ -569,7 +543,7 @@ void IssArray::ConstructDetector(G4LogicalVolume* world) {
void IssArray::InitializeRootOutput() {
RootOutput* pAnalysis = RootOutput::getInstance();
- TTree* pTree = pAnalysis->GetTree();
+ TTree* pTree = pAnalysis->GetTree();
if (!pTree->FindBranch("ISS")) {
pTree->Branch("ISS", "TIssData", &m_Event);
}
@@ -590,246 +564,217 @@ void IssArray::ReadSensitive(const G4Event*) {
// Read the Scorer associate to the Silicon Strip in case of PS_Images (See NPLib/Detectors/Iss/ressources)
///////////
// BOX
- DSSDScorers::PS_Rectangle* BOXScorer = (DSSDScorers::PS_Rectangle*) m_BOXScorer->GetPrimitive(0);
-
+ DSSDScorers::PS_Rectangle* BOXScorer = (DSSDScorers::PS_Rectangle*)m_BOXScorer->GetPrimitive(0);
// Loop on the BOX map
- unsigned int sizeFront= BOXScorer->GetLengthMult();
+ unsigned int sizeFront = BOXScorer->GetLengthMult();
- for (unsigned int i=0 ; i<sizeFront ; i++){
+ for (unsigned int i = 0; i < sizeFront; i++) {
double Energy = BOXScorer->GetEnergyLength(i);
- if(Energy>ThresholdSi){
- double Time = BOXScorer->GetTimeLength(i);
- int DetNbr = BOXScorer->GetDetectorLength(i);
- int StripFront = BOXScorer->GetStripLength(i);
-
- m_Event->SetFront(DetNbr,
- StripFront,
- RandGauss::shoot(Energy, ResoStrip),
- RandGauss::shoot(Time, ResoTime),
- RandGauss::shoot(Time, ResoTime));
+ if (Energy > ThresholdSi) {
+ double Time = BOXScorer->GetTimeLength(i);
+ int DetNbr = BOXScorer->GetDetectorLength(i);
+ int StripFront = BOXScorer->GetStripLength(i);
+
+ m_Event->SetFront(DetNbr, StripFront, RandGauss::shoot(Energy, ResoStrip), RandGauss::shoot(Time, ResoTime),
+ RandGauss::shoot(Time, ResoTime));
}
- }
+ }
- unsigned int sizeBack= BOXScorer->GetWidthMult();
- for (unsigned int i=0 ; i<sizeBack ; i++){
+ unsigned int sizeBack = BOXScorer->GetWidthMult();
+ for (unsigned int i = 0; i < sizeBack; i++) {
double Energy = BOXScorer->GetEnergyWidth(i);
- if(Energy>ThresholdSi){
- double Time = BOXScorer->GetTimeWidth(i);
- int DetNbr = BOXScorer->GetDetectorWidth(i);
- int StripBack = BOXScorer->GetStripWidth(i);
+ if (Energy > ThresholdSi) {
+ double Time = BOXScorer->GetTimeWidth(i);
+ int DetNbr = BOXScorer->GetDetectorWidth(i);
+ int StripBack = BOXScorer->GetStripWidth(i);
- m_Event->SetBack(DetNbr,
- Silicon_Back_NumberOfStrip-StripBack+1,
- RandGauss::shoot(Energy, ResoStrip),
- RandGauss::shoot(Time, ResoTime),
- RandGauss::shoot(Time, ResoTime));
+ m_Event->SetBack(DetNbr, Silicon_Back_NumberOfStrip - StripBack + 1, RandGauss::shoot(Energy, ResoStrip),
+ RandGauss::shoot(Time, ResoTime), RandGauss::shoot(Time, ResoTime));
}
}
// clear map for next event
BOXScorer->clear();
-
-
/////////////////////
// Read the Scorer associate to the Silicon Strip in case of using mask ( See NPLib/Detectors/Iss/ressources)
- /* DSSDScorers::PS_Images* SiScorer
- = (DSSDScorers::PS_Images*)m_StripScorer->GetPrimitive(0);
-
- bool SiScoredHit; // flag true if first stage scores a hit above threshold
- set<int> trig; // list of telescope that got a Si trigger
- unsigned int sizeFront = SiScorer->GetFrontMult();
- unsigned int sizeBack = SiScorer->GetBackMult();
-
- // Check for double match Strip :
- // rare case where a particle hit a strip and then an interstrip
- // since the map idex is build on pixel value, we end up with the same strip
- // fired twice, which is impossible in reality.
- std::map< unsigned int, std::pair<double,double> > mapFront;
- std::map< unsigned int, std::pair<double,double> >::iterator it;
-
- for (unsigned int i = 0; i < sizeFront; i++) {
- double energy = SiScorer->GetEnergyFront(i);
- int detectorNbr = SiScorer->GetDetectorFront(i);
- double time = SiScorer->GetTimeFront(i);
- // Pixel value at interaction point
- unsigned int a, r, g, b;
- // pixel
- SiScorer->GetARGBFront(i, a, r, g, b);
- if (r == 0) {
- mapFront[b+detectorNbr*1e6].first+=energy;
- mapFront[b+detectorNbr*1e6].second=time;
- }
-
- else { // Interstrip X, keep maximum shared energy
- double rand = G4UniformRand();
- if (rand > 0.5) {
- double energyX = rand * energy;
- mapFront[b+detectorNbr*1e6].first+=energyX;
- mapFront[b+detectorNbr*1e6].second=time;
- }
-
- else {
- double energyX = (1 - rand) * energy;
- mapFront[g+detectorNbr*1e6].first+=energyX;
- mapFront[g+detectorNbr*1e6].second=time;
- }
- }
- }
-
- for(it=mapFront.begin();it!=mapFront.end();it++){
- double energyX = RandGauss::shoot(it->second.first, ResoStrip);
- double timeX = TimeOffset - RandGauss::shoot(it->second.second, ResoTimeMust);
- unsigned int strip = it->first-1000000*(it->first/1000000);
- unsigned int det = it->first/1000000;
- if (energyX > ThresholdSi) {
- trig.insert(det);
- SiScoredHit = true;
- m_Event->SetStripXE(det, strip ,
- NPL::EnergyToADC(energyX, 0, 63, 8192, 16384));
- m_Event->SetStripXT(det, strip ,
- NPL::EnergyToADC(timeX, 0, 1000, 8192, 16384));
- }
- }
+ /* DSSDScorers::PS_Images* SiScorer
+ = (DSSDScorers::PS_Images*)m_StripScorer->GetPrimitive(0);
+
+ bool SiScoredHit; // flag true if first stage scores a hit above threshold
+ set<int> trig; // list of telescope that got a Si trigger
+ unsigned int sizeFront = SiScorer->GetFrontMult();
+ unsigned int sizeBack = SiScorer->GetBackMult();
+
+ // Check for double match Strip :
+ // rare case where a particle hit a strip and then an interstrip
+ // since the map idex is build on pixel value, we end up with the same strip
+ // fired twice, which is impossible in reality.
+ std::map< unsigned int, std::pair<double,double> > mapFront;
+ std::map< unsigned int, std::pair<double,double> >::iterator it;
+
+ for (unsigned int i = 0; i < sizeFront; i++) {
+ double energy = SiScorer->GetEnergyFront(i);
+ int detectorNbr = SiScorer->GetDetectorFront(i);
+ double time = SiScorer->GetTimeFront(i);
+ // Pixel value at interaction point
+ unsigned int a, r, g, b;
+ // pixel
+ SiScorer->GetARGBFront(i, a, r, g, b);
+ if (r == 0) {
+ mapFront[b+detectorNbr*1e6].first+=energy;
+ mapFront[b+detectorNbr*1e6].second=time;
+ }
- // Check for double match Strip :
- // rare case where a particle hit a strip and then an interstrip
- // since the map idex is build on pixel value, we end up with the same strip
- // fired twice, which is impossible in reality.
- std::map< unsigned int, std::pair<double,double> > mapBack;
+ else { // Interstrip X, keep maximum shared energy
+ double rand = G4UniformRand();
+ if (rand > 0.5) {
+ double energyX = rand * energy;
+ mapFront[b+detectorNbr*1e6].first+=energyX;
+ mapFront[b+detectorNbr*1e6].second=time;
+ }
+
+ else {
+ double energyX = (1 - rand) * energy;
+ mapFront[g+detectorNbr*1e6].first+=energyX;
+ mapFront[g+detectorNbr*1e6].second=time;
+ }
+ }
+ }
- for (unsigned int i = 0; i < sizeBack; i++) {
- double energy = SiScorer->GetEnergyBack(i);
- int detectorNbr = SiScorer->GetDetectorBack(i);
- double time = SiScorer->GetTimeBack(i);
-
- // Pixel value at interaction point
- unsigned int a, r, g, b;
- // pixel
- SiScorer->GetARGBBack(i, a, r, g, b);
- if (r == 0) {
- mapBack[b+detectorNbr*1e6].first+=energy;
- mapBack[b+detectorNbr*1e6].second=time;
- }
- else { // Interstrip Y, keep both strip with shared energy
- double rand = G4UniformRand();
- double energyY1 = rand * energy;
- mapBack[b+detectorNbr*1e6].first+=energyY1;
- mapBack[b+detectorNbr*1e6].second=time;
-
- double energyY2 = (1 - rand) * energy;
- mapBack[g+detectorNbr*1e6].first+=energyY2;
- mapBack[g+detectorNbr*1e6].second=time;
- }
- }
+ for(it=mapFront.begin();it!=mapFront.end();it++){
+ double energyX = RandGauss::shoot(it->second.first, ResoStrip);
+ double timeX = TimeOffset - RandGauss::shoot(it->second.second, ResoTimeMust);
+ unsigned int strip = it->first-1000000*(it->first/1000000);
+ unsigned int det = it->first/1000000;
+ if (energyX > ThresholdSi) {
+ trig.insert(det);
+ SiScoredHit = true;
+ m_Event->SetStripXE(det, strip ,
+ NPL::EnergyToADC(energyX, 0, 63, 8192, 16384));
+ m_Event->SetStripXT(det, strip ,
+ NPL::EnergyToADC(timeX, 0, 1000, 8192, 16384));
+ }
+ }
- for(it=mapBack.begin();it!=mapBack.end();it++){
- double energyY = RandGauss::shoot(it->second.first, ResoStrip);
- double timeX = TimeOffset - RandGauss::shoot(it->second.second, ResoTimeMust);
- unsigned int strip = it->first-1000000*(it->first/1000000);
- unsigned int det = it->first/1000000;
- if (energyY > ThresholdSi) {
- trig.insert(det);
- SiScoredHit = true;
- m_Event->SetStripYE(det, strip ,
- NPL::EnergyToADC(energyY, 0, 63, 8192, 0));
- m_Event->SetStripYT(det, strip ,
- NPL::EnergyToADC(timeX, 0, 1000, 8192, 16384));
- }
- }
-*/
+ // Check for double match Strip :
+ // rare case where a particle hit a strip and then an interstrip
+ // since the map idex is build on pixel value, we end up with the same strip
+ // fired twice, which is impossible in reality.
+ std::map< unsigned int, std::pair<double,double> > mapBack;
+
+ for (unsigned int i = 0; i < sizeBack; i++) {
+ double energy = SiScorer->GetEnergyBack(i);
+ int detectorNbr = SiScorer->GetDetectorBack(i);
+ double time = SiScorer->GetTimeBack(i);
+
+ // Pixel value at interaction point
+ unsigned int a, r, g, b;
+ // pixel
+ SiScorer->GetARGBBack(i, a, r, g, b);
+ if (r == 0) {
+ mapBack[b+detectorNbr*1e6].first+=energy;
+ mapBack[b+detectorNbr*1e6].second=time;
+ }
+ else { // Interstrip Y, keep both strip with shared energy
+ double rand = G4UniformRand();
+ double energyY1 = rand * energy;
+ mapBack[b+detectorNbr*1e6].first+=energyY1;
+ mapBack[b+detectorNbr*1e6].second=time;
+
+ double energyY2 = (1 - rand) * energy;
+ mapBack[g+detectorNbr*1e6].first+=energyY2;
+ mapBack[g+detectorNbr*1e6].second=time;
+ }
+ }
+
+ for(it=mapBack.begin();it!=mapBack.end();it++){
+ double energyY = RandGauss::shoot(it->second.first, ResoStrip);
+ double timeX = TimeOffset - RandGauss::shoot(it->second.second, ResoTimeMust);
+ unsigned int strip = it->first-1000000*(it->first/1000000);
+ unsigned int det = it->first/1000000;
+ if (energyY > ThresholdSi) {
+ trig.insert(det);
+ SiScoredHit = true;
+ m_Event->SetStripYE(det, strip ,
+ NPL::EnergyToADC(energyY, 0, 63, 8192, 0));
+ m_Event->SetStripYT(det, strip ,
+ NPL::EnergyToADC(timeX, 0, 1000, 8192, 16384));
+ }
+ }
+ */
// Look for 2nd and 3rd stage only if 1st stage is hit
-/* if (SiScoredHit) {
- }
-*/
+ /* if (SiScoredHit) {
+ }
+ */
}
-
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void IssArray::InitializeScorers() {
// Silicon Associate Scorer
bool already_exist = false;
- //m_StripScorer = CheckScorer("ISS_StripScorer", already_exist);
- m_BOXScorer = CheckScorer("ISS_BOXScorer",already_exist);
-
+ // m_StripScorer = CheckScorer("ISS_StripScorer", already_exist);
+ m_BOXScorer = CheckScorer("ISS_BOXScorer", already_exist);
// if the scorer were created previously nothing else need to be made
- if (already_exist){
- cout << "SCORER already exist" << endl;
+ if (already_exist) {
+ cout << "SCORER already exist" << endl;
return;
}
- string nptool = getenv("NPTOOL");
-
-
- G4VPrimitiveScorer* BOXScorer =
- new DSSDScorers::PS_Rectangle("IssBOX",0,
- SiliconFaceLength,
- SiliconFaceWidth,
- Silicon_Front_NumberOfStrip ,
- Silicon_Back_NumberOfStrip);
+ string nptool = getenv("NPTOOL");
+ G4VPrimitiveScorer* BOXScorer = new DSSDScorers::PS_Rectangle(
+ "IssBOX", 0, SiliconFaceLength, SiliconFaceWidth, Silicon_Front_NumberOfStrip, Silicon_Back_NumberOfStrip);
-/* is using mask:
- G4VPrimitiveScorer* SiScorer = new DSSDScorers::PS_Images(
- "SiScorer", nptool + "/NPLib/Detectors/Iss/ressources/maskFront.png",
- nptool + "/NPLib/Detectors/Iss/ressources/maskBack.png", 127./12800, 19.9/1100, 0,
- 0, 0xffff0000, 0);
-*/
+ /* is using mask:
+ G4VPrimitiveScorer* SiScorer = new DSSDScorers::PS_Images(
+ "SiScorer", nptool + "/NPLib/Detectors/Iss/ressources/maskFront.png",
+ nptool + "/NPLib/Detectors/Iss/ressources/maskBack.png", 127./12800, 19.9/1100, 0,
+ 0, 0xffff0000, 0);
+ */
- G4VPrimitiveScorer* InterScorer
- = new InteractionScorers::PS_Interactions("SiScorer", ms_InterCoord, 0);
+ G4VPrimitiveScorer* InterScorer = new InteractionScorers::PS_Interactions("SiScorer", ms_InterCoord, 0);
// and register it to the multifunctionnal detector
m_BOXScorer->RegisterPrimitive(BOXScorer);
m_BOXScorer->RegisterPrimitive(InterScorer);
-// if using mask:
-// m_StripScorer->RegisterPrimitive(SiScorer);
-// m_StripScorer->RegisterPrimitive(InterScorer);
-
-
+ // if using mask:
+ // m_StripScorer->RegisterPrimitive(SiScorer);
+ // m_StripScorer->RegisterPrimitive(InterScorer);
// Add All Scorer to the Global Scorer Manager
G4SDManager::GetSDMpointer()->AddNewDetector(m_BOXScorer);
- //G4SDManager::GetSDMpointer()->AddNewDetector(m_StripScorer);
-
+ // G4SDManager::GetSDMpointer()->AddNewDetector(m_StripScorer);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void IssArray::InitializeMaterial() {
- m_MaterialSilicon
- = MaterialManager::getInstance()->GetMaterialFromLibrary("Si");
- m_MaterialAluminium
- = MaterialManager::getInstance()->GetMaterialFromLibrary("Al");
+ m_MaterialSilicon = MaterialManager::getInstance()->GetMaterialFromLibrary("Si");
+ m_MaterialAluminium = MaterialManager::getInstance()->GetMaterialFromLibrary("Al");
m_MaterialIron = MaterialManager::getInstance()->GetMaterialFromLibrary("Fe");
- m_MaterialVacuum
- = MaterialManager::getInstance()->GetMaterialFromLibrary("Vacuum");
+ m_MaterialVacuum = MaterialManager::getInstance()->GetMaterialFromLibrary("Vacuum");
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4RotationMatrix* Rotation(double tetaX, double tetaY, double tetaZ) {
- double PI = 3.141592653589793238;
+ double PI = 3.141592653589793238;
double radX = tetaX * PI / 180.;
double radY = tetaY * PI / 180.;
double radZ = tetaZ * PI / 180.;
- G4ThreeVector col1 = G4ThreeVector(cos(radZ) * cos(radY),
- -sin(radZ) * cos(radY), -sin(radY));
- G4ThreeVector col2
- = G4ThreeVector(sin(radZ) * cos(radX) - cos(radZ) * sin(radY) * sin(radX),
- cos(radZ) * cos(radX) + sin(radZ) * sin(radY) * sin(radX),
- -cos(radY) * sin(radX));
- G4ThreeVector col3
- = G4ThreeVector(sin(radZ) * sin(radX) + cos(radZ) * sin(radY) * sin(radX),
- cos(radZ) * sin(radX) - sin(radZ) * sin(radY) * cos(radX),
- cos(radY) * cos(radX));
+ G4ThreeVector col1 = G4ThreeVector(cos(radZ) * cos(radY), -sin(radZ) * cos(radY), -sin(radY));
+ G4ThreeVector col2 = G4ThreeVector(sin(radZ) * cos(radX) - cos(radZ) * sin(radY) * sin(radX),
+ cos(radZ) * cos(radX) + sin(radZ) * sin(radY) * sin(radX), -cos(radY) * sin(radX));
+ G4ThreeVector col3 = G4ThreeVector(sin(radZ) * sin(radX) + cos(radZ) * sin(radY) * sin(radX),
+ cos(radZ) * sin(radX) - sin(radZ) * sin(radY) * cos(radX), cos(radY) * cos(radX));
return (new G4RotationMatrix(col1, col2, col3));
}
@@ -837,22 +782,19 @@ G4RotationMatrix* Rotation(double tetaX, double tetaY, double tetaZ) {
////////////////////////////////////////////////////////////////////////////////
// Construct Method to be pass to the DetectorFactory //
////////////////////////////////////////////////////////////////////////////////
-NPS::VDetector* IssArray::Construct() {
- return (NPS::VDetector*)new IssArray();
-}
+NPS::VDetector* IssArray::Construct() { return (NPS::VDetector*)new IssArray(); }
////////////////////////////////////////////////////////////////////////////////
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C" {
- class proxy_nps_iss{
- public:
- proxy_nps_iss() {
- NPS::DetectorFactory::getInstance()->AddToken("ISSDet", "ISS");
- NPS::DetectorFactory::getInstance()->AddDetector("ISSDet",
- IssArray::Construct);
- }
- };
+class proxy_nps_iss {
+ public:
+ proxy_nps_iss() {
+ NPS::DetectorFactory::getInstance()->AddToken("ISSDet", "ISS");
+ NPS::DetectorFactory::getInstance()->AddDetector("ISSDet", IssArray::Construct);
+ }
+};
- proxy_nps_iss p_nps_iss;
+proxy_nps_iss p_nps_iss;
}
--
GitLab