Skip to content
Snippets Groups Projects
Commit 50741c3a authored by Cyril Lenain's avatar Cyril Lenain :surfer_tone3:
Browse files

updating Minos and Dali geometries and materials, adding new materials in NPMaterials

parent 183e5b48
No related branches found
No related tags found
No related merge requests found
Pipeline #62978 passed
Stage: build-NPLib
Stage: build-NPSimulation
Stage: test
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1751 additions and 2114 deletions
NPLib/Detectors/Dali/TDaliData.cxx
+ 3
− 0
View file @ 50741c3a
......@@ -52,10 +52,13 @@ void TDaliData::Clear() {
fDali_T_DetectorNbr.clear();
fDali_TDC.clear();
fDali_Time.clear();
/* fDali_ParticleID.clear(); */
}
//////////////////////////////////////////////////////////////////////
void TDaliData::Dump() const {
// This method is very useful for debuging and worth the dev.
......
NPLib/Detectors/Dali/TDaliData.h
+ 9
− 4
View file @ 50741c3a
......@@ -44,13 +44,12 @@ class TDaliData : public TObject {
vector<Double_t> fDali_TDC;
vector<Double_t> fDali_Time;
/* vector<Int_t> fDali_ParticleID; */
//////////////////////////////////////////////////////////////
// Constructor and destructor
public:
TDaliData();
~TDaliData();
//////////////////////////////////////////////////////////////
// Inherited from TObject and overriden to avoid warnings
......@@ -59,7 +58,6 @@ class TDaliData : public TObject {
void Clear(const Option_t*) {};
void Dump() const;
//////////////////////////////////////////////////////////////
// Getters and Setters
// Prefer inline declaration to avoid unnecessary called of
......@@ -93,6 +91,11 @@ class TDaliData : public TObject {
fDali_T_DetectorNbr.push_back(DetNbr);
fDali_Time.push_back(Time);
};//!
// ID for simulation
/* inline void SetParticleID(const Int_t& ID) { */
/* fDali_ParticleID.push_back(ID); */
/* };//! */
// (A&T DC)
inline void SetADCAndTDC(const UShort_t& DetNbr,const Double_t& Energy,const Double_t& Time){
......@@ -133,7 +136,9 @@ class TDaliData : public TObject {
inline Double_t Get_Time(const unsigned int &i) const
{return fDali_Time[i];}//!
/* inline Int_t GetParticleID(const unsigned int &i) const */
/* {return fDali_ParticleID[i];}//! */
//////////////////////////////////////////////////////////////
// Required for ROOT dictionnary
ClassDef(TDaliData,1) // DaliData structure
......
NPLib/Detectors/Dali/TDaliPhysics.cxx
+ 31
− 29
View file @ 50741c3a
......@@ -75,8 +75,6 @@ void TDaliPhysics::BuildSimplePhysicalEvent() {
BuildPhysicalEvent();
}
///////////////////////////////////////////////////////////////////////////
void TDaliPhysics::BuildPhysicalEvent() {
// apply thresholds and calibration
......@@ -94,6 +92,8 @@ void TDaliPhysics::BuildPhysicalEvent() {
}
}
}
}
///////////////////////////////////////////////////////////////////////////
......@@ -110,6 +110,8 @@ void TDaliPhysics::PreTreat() {
// Energy
unsigned int mysize = m_EventData->GetMultEnergy();
for (UShort_t i = 0; i < mysize ; ++i) {
/* ParticleID.push_back(m_EventData->GetParticleID(i)); */
if (m_EventData->Get_Energy(i) > m_E_RAW_Threshold) {
Double_t Energy = Cal->ApplyCalibration("Dali/ENERGY"+NPL::itoa(m_EventData->GetE_DetectorNbr(i)),m_EventData->Get_Energy(i));
if (Energy > m_E_Threshold) {
......@@ -124,10 +126,11 @@ void TDaliPhysics::PreTreat() {
Double_t Time= Cal->ApplyCalibration("Dali/TIME"+NPL::itoa(m_EventData->GetT_DetectorNbr(i)),m_EventData->Get_Time(i));
m_PreTreatedData->SetTime(m_EventData->GetT_DetectorNbr(i), Time);
}
}
}
///////////////////////////////////////////////////////////////////////////
void TDaliPhysics::ReadAnalysisConfig() {
bool ReadingStatus = false;
......@@ -190,13 +193,12 @@ void TDaliPhysics::ReadAnalysisConfig() {
}
}
///////////////////////////////////////////////////////////////////////////
void TDaliPhysics::Clear() {
DetectorNumber.clear();
Energy.clear();
Time.clear();
/* ParticleID.clear(); */
}
......@@ -207,32 +209,32 @@ void TDaliPhysics::ReadConfiguration(NPL::InputParser parser) {
if(NPOptionManager::getInstance()->GetVerboseLevel())
cout << "//// " << blocks.size() << " detectors found " << endl;
vector<string> cart = {"POS","Shape"};
vector<string> sphe = {"R","Theta","Phi","Shape"};
/* vector<string> cart = {"POS","Shape"}; */
/* vector<string> sphe = {"R","Theta","Phi","Shape"}; */
for(unsigned int i = 0 ; i < blocks.size() ; i++){
if(blocks[i]->HasTokenList(cart)){
if(NPOptionManager::getInstance()->GetVerboseLevel())
cout << endl << "//// Dali " << i+1 << endl;
/* for(unsigned int i = 0 ; i < blocks.size() ; i++){ */
/* if(blocks[i]->HasTokenList(cart)){ */
/* if(NPOptionManager::getInstance()->GetVerboseLevel()) */
/* cout << endl << "//// Dali " << i+1 << endl; */
TVector3 Pos = blocks[i]->GetTVector3("POS","mm");
string Shape = blocks[i]->GetString("Shape");
AddDetector(Pos,Shape);
}
else if(blocks[i]->HasTokenList(sphe)){
if(NPOptionManager::getInstance()->GetVerboseLevel())
cout << endl << "//// Dali " << i+1 << endl;
double R = blocks[i]->GetDouble("R","mm");
double Theta = blocks[i]->GetDouble("Theta","deg");
double Phi = blocks[i]->GetDouble("Phi","deg");
string Shape = blocks[i]->GetString("Shape");
AddDetector(R,Theta,Phi,Shape);
}
else{
cout << "ERROR: check your input file formatting " << endl;
exit(1);
}
}
/* TVector3 Pos = blocks[i]->GetTVector3("POS","mm"); */
/* string Shape = blocks[i]->GetString("Shape"); */
/* AddDetector(Pos,Shape); */
/* } */
/* else if(blocks[i]->HasTokenList(sphe)){ */
/* if(NPOptionManager::getInstance()->GetVerboseLevel()) */
/* cout << endl << "//// Dali " << i+1 << endl; */
/* double R = blocks[i]->GetDouble("R","mm"); */
/* double Theta = blocks[i]->GetDouble("Theta","deg"); */
/* double Phi = blocks[i]->GetDouble("Phi","deg"); */
/* string Shape = blocks[i]->GetString("Shape"); */
/* AddDetector(R,Theta,Phi,Shape); */
/* } */
/* else{ */
/* cout << "ERROR: check your input file formatting " << endl; */
/* exit(1); */
/* } */
/* } */
}
///////////////////////////////////////////////////////////////////////////
......
NPLib/Detectors/Dali/TDaliPhysics.h
+ 11
− 0
View file @ 50741c3a
......@@ -67,6 +67,7 @@ class TDaliPhysics : public TObject, public NPL::VDetector {
vector<double> Energy;
vector<double> TDC;
vector<double> Time;
/* vector<int> ParticleID; */
/// A usefull method to bundle all operation to add a detector
void AddDetector(TVector3 POS, string shape);
......@@ -155,6 +156,16 @@ class TDaliPhysics : public TObject, public NPL::VDetector {
TDaliData* GetRawData() const {return m_EventData;}
TDaliData* GetPreTreatedData() const {return m_PreTreatedData;}
// Use to access energies et det number
int GetDetNumber(const int &i) const {return DetectorNumber[i];};
int GetMultEnergy() const {return Energy.size();};
double GetEnergy(const int &i) const {return Energy[i];};
/* int GetParticleID(const int &i) const {return ParticleID[i];}; */
// parameters used in the analysis
private:
// thresholds
......
NPLib/Detectors/Minos/TMinosPhysics.cxx
+ 607
− 678
View file @ 50741c3a
This diff is collapsed.
NPLib/Detectors/Minos/TMinosPhysics.h
+ 24
− 17
View file @ 50741c3a
......@@ -63,8 +63,6 @@ class TMinosPhysics : public TObject, public NPL::VDetector {
void Clear(const Option_t*) {};
/* static void SumDistance(int &, double *, double & sum, double * par, int); */
//////////////////////////////////////////////////////////////
// data obtained after BuildPhysicalEvent() and stored in
// output ROOT file
......@@ -116,12 +114,10 @@ class TMinosPhysics : public TObject, public NPL::VDetector {
NPL::Tracking* Tracking_functions; //!
/* int NclusterFit; //! */
// fit function for the Q(t) signals at each pad
static double conv_fit(double *x, double *p);
static double distance2(double x,double y,double z, double *p);
static void SumDistance(int &, double *, double & sum, double * par, int);
// remove bad channels, calibrate the data and apply thresholds
void PreTreat();
......@@ -164,16 +160,22 @@ TMinosResult *minosdata_result;//!
vector<double> GetPad_X() {return X_Pad;}
vector<double> GetPad_Y() {return Y_Pad;}
vector<double> GetPad_Z() {return Z_Pad;}
vector<double> GetPad_T() {return T_Pad;}
vector<double> GetParFit1() {return parFit1;}
vector<double> GetParFit2() {return parFit2;}
vector<double> GetParFit3() {return parFit3;}
vector<double> GetParFit4() {return parFit4;}
double GetVertexZ() {return Zvertex[0];}
double GetVertexZ() {return Zvertex;}
double GetVertexX() {return Xvertex;}
double GetVertexY() {return Yvertex;}
/* TClonesArray fitdata; */
/* fitdata.SetClass("TMinosClust"); */
double GetTheta1() {return Theta1 ;}
double GetTheta2() {return Theta2 ;}
double GetTheta_1() {return Theta_1 ;}
double GetTheta_2() {return Theta_2 ;}
double GetPhi1(){return Phi1;}
double GetPhi2(){return Phi2;}
// parameters used in the analysis
private:
......@@ -256,13 +258,19 @@ TMinosResult *minosdata_result;//!
vector<double> TOTzoutprime;
vector<double> TOTqout;
vector<double> Xvertex;
vector<double> Yvertex;
vector<double> Zvertex;
double Xvertex;
double Yvertex;
double Zvertex;
double Dmin;
vector<double> sumTheta;
vector<double> Theta1;
vector<double> Theta2;
double sumTheta;
double Theta1;
double Theta2;
double Theta_1;
double Theta_2;
double Phi1;
double Phi2;
vector<int> trackclusternbr;//!
vector<int> tracknbr;//!
......@@ -302,12 +310,11 @@ TMinosResult *minosdata_result;//!
vector<double> errFit3_local;
vector<double> errFit4_local;
double xv;//!
double yv;//!
double zv;//!
double Dist_min;//!
double Dist_min;
double Theta_tr1;//!
double Theta_tr2;//!
// number of detectors
......
NPLib/TrackReconstruction/Tracking.cxx
+ 399
− 380
View file @ 50741c3a
This diff is collapsed.
NPLib/TrackReconstruction/Tracking.h
+ 1
− 1
View file @ 50741c3a
......@@ -23,7 +23,7 @@ class Tracking {
void FindStart(double pStart[4], double chi[2], int fitStatus[2],TGraph *grxz, TGraph *gryz);
double distance2(double x,double y,double z, double *p);
void Hough_3D(vector<double> *x,vector<double> *y,vector<double> *z,vector<double> *q,vector<double> *x_out,vector<double> *y_out,vector<double> *z_out,vector<double> *q_out);
void vertex(double *p, double *pp, double &xv,double &yv,double &zv, double &min_dist, double &Theta_tr1, double &Theta_tr2);
void vertex(double *p, double *pp, double &xv,double &yv,double &zv, double &min_dist, double &Theta_tr1, double &Theta_tr2, double &Phi1, double &Phi2);
void ParFor_Vertex(double *a, double *b, double *parFit);
ClassDef(Tracking,1);
......
NPSimulation/Core/MaterialManager.cc
+ 221
− 150
View file @ 50741c3a
This diff is collapsed.
NPSimulation/Detectors/Dali/Dali.cc
+ 135
− 261
View file @ 50741c3a
This diff is collapsed.
NPSimulation/Detectors/Dali/Dali.hh
+ 12
− 18
View file @ 50741c3a
......@@ -51,35 +51,33 @@ class Dali : public NPS::VDetector{
////////////////////////////////////////////////////
public:
// Cartesian
void AddDetector(G4ThreeVector POS, string Shape);
void AddDetector(G4ThreeVector POS);
// Spherical
void AddDetector(double R,double Theta,double Phi,string Shape);
void AddDetector(double R,double Theta,double Phi);
//Cylindrical
void AddDetector2(double R,double Alpha,double Zeta,string Shape);
void AddDetector(double R,double Alpha,double Zeta, int Ring);
G4LogicalVolume* BuildSquareDetector();
G4LogicalVolume* BuildCylindricalDetector();
private:
G4LogicalVolume* m_SquareDetector;
G4LogicalVolume* m_SquareDetector_Can;
G4LogicalVolume* m_Square2Detector_Can;
G4LogicalVolume* m_CylindricalDetector;
G4LogicalVolume* m_SquareDetector_CanMgO;
G4LogicalVolume* m_SquareDetector_Crystal;
G4LogicalVolume* Log_Dali_box;
G4LogicalVolume* Log_Al_Cryst_can;
G4LogicalVolume* Log_MgO_Cryst_can;
G4LogicalVolume* Log_Crystal;
G4LogicalVolume* lAlPMT;
G4LogicalVolume* Log_Dali_1Volume;
G4LogicalVolume* Log_Dali_3Volume;
G4LogicalVolume* m_CylindricalDetector;
G4LogicalVolume* lMuPMT;
G4LogicalVolume* lTopPlatePMT;
G4LogicalVolume* lGlassPMT;
G4LogicalVolume* AriaExtrude;
G4LogicalVolume* Logic_ArrayDali_1;
G4Material* MgO;
G4Material* NaI_Tl;
////////////////////////////////////////////////////
////// Inherite from NPS::VDetector class /////////
////////////////////////////////////////////////////
......@@ -91,7 +89,6 @@ class Dali : public NPS::VDetector{
// Definition of materials
// Called in ConstructDetector()
void DefinitionMaterials();
// Construct detector and inialise sensitive part.
// Called After DetecorConstruction::AddDetector Method
......@@ -125,13 +122,10 @@ class Dali : public NPS::VDetector{
vector<double> m_Zeta;
vector<double> m_R;
vector<double> m_Alpha;
vector<int> m_Ring;
// Shape type
vector<string> m_Shape ;
// Visualisation Attribute
G4VisAttributes* m_VisSquare;
G4VisAttributes* m_VisCylinder;
// Needed for dynamic loading of the library
public:
......
NPSimulation/Detectors/Minos/Minos.cc
+ 256
− 497
View file @ 50741c3a
This diff is collapsed.
NPSimulation/Detectors/Minos/Minos.hh
+ 11
− 29
View file @ 50741c3a
......@@ -65,21 +65,12 @@ class Minos : public NPS::VDetector{
void DefineMaterials();
public:
void SetTargetMaterial(G4String materialChoice);
void SetChamberMaterial(G4String materialChoice);
void SetTPCMaterial(G4String materialChoice);
void SetWindowMaterial(G4String materialChoice);
void SetInnerRohacellMaterial(G4String materialChoice);
void SetOuterRohacellMaterial(G4String materialChoice);
void SetKaptonMaterial(G4String materialChoice);
G4LogicalVolume* BuildSquareDetector();
G4LogicalVolume* BuildCylindricalDetector();
G4LogicalVolume* BuildTarget();
G4LogicalVolume* BuildChamber();
G4LogicalVolume* BuildInnerRohacell();
G4LogicalVolume* BuildOuterRohacell();
G4LogicalVolume* BuildOuterOuterRohacell();
G4LogicalVolume* BuildKapton();
G4LogicalVolume* BuildOuterKapton();
G4LogicalVolume* BuildTPC();
......@@ -97,12 +88,13 @@ class Minos : public NPS::VDetector{
G4Material* TargetMaterial;
G4Material* WindowMaterial;
G4Material* ChamberMaterial;
G4Material* InnerRohacellMaterial;
G4Material* OuterRohacellMaterial;
G4Material* RohacellMaterial;
G4Material* KaptonMaterial;
G4Material* TPCMaterial;
G4Material* defaultMaterial;
G4Material* Mylar;
G4LogicalVolume* m_SquareDetector;
G4LogicalVolume* m_CylindricalDetector;
......@@ -123,21 +115,13 @@ class Minos : public NPS::VDetector{
G4LogicalVolume* logicWindow0;
// G4VPhysicalVolume* physiWindow0;
G4Tubs* solidWindow1;
G4LogicalVolume* logicWindow1;
// G4VPhysicalVolume* physiWindow1;
G4Tubs* solidWindow2;
G4LogicalVolume* logicWindow2;
// G4VPhysicalVolume* physiWindow2;
G4Tubs* solidInnerRohacell;
G4LogicalVolume* logicInnerRohacell;
G4Tubs* solidRohacell;
G4LogicalVolume* logicRohacell;
// G4VPhysicalVolume* physiInnerRohacell;
G4Tubs* solidOuterRohacell;
G4LogicalVolume* logicOuterRohacell;
// G4VPhysicalVolume* physiOuterRohacell;
/* G4Tubs* solidOuterRohacell; */
/* G4LogicalVolume* logicOuterRohacell; */
/* // G4VPhysicalVolume* physiOuterRohacell; */
G4Tubs* solidKapton;
G4LogicalVolume* logicKapton;
......@@ -203,9 +187,7 @@ class Minos : public NPS::VDetector{
G4VisAttributes* m_VisTarget;
G4VisAttributes* m_VissimpleBox;
G4VisAttributes* m_VisTPC;
G4VisAttributes* m_VisInnerRohacell;
G4VisAttributes* m_VisOuterRohacell;
G4VisAttributes* m_VisOuterOuterRohacell;
G4VisAttributes* m_VisRohacell;
G4VisAttributes* m_VisKapton;
G4VisAttributes* m_VisTargetCell;
G4VisAttributes* m_VisOuterKapton;
......
Projects/Dali/Dali.detector
+ 31
− 50
View file @ 50741c3a
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Target
THICKNESS= 20 mm
RADIUS= 20 mm
MATERIAL= CD2
ANGLE= 0 deg
X= 0 mm
Y= 0 mm
Z= 220 mm
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = 240 deg
Zeta = -90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 298,28 mm
Ring = 1
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = 180 deg
Zeta = -90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 298,28 mm
Ring = 1
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
R= 212.4 mm
Alpha = 120 deg
Zeta = -90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 298,28 mm
Ring = 1
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = 60 deg
Zeta = -90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 298,28 mm
Ring = 1
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = 0 deg
Zeta = -90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 298,28 mm
Ring = 1
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = -60 deg
Zeta = -90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 298,28 mm
Ring = 1
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = 240 deg
Zeta = 90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 469.28 mm
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = 180 deg
Zeta = 90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 469.28 mm
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = 120 deg
Zeta = 90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 469.28 mm
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = 60 deg
Zeta = 90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 469.28 mm
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = 0 deg
Zeta = 90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 469.28 mm
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Dali
R = 212.4 mm
Alpha = -60 deg
Zeta = 90.03 mm
Shape = Square
Material = NaI_Tl
Zeta = 469.28 mm
Material = NaI(Tl)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Projects/Dali/DaliMinos.detector 100644 → 100755
+ 0
− 0
View file @ 50741c3a
File mode changed from 100644 to 100755
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment