Skip to content
Snippets Groups Projects
Commit 981606c9 authored by Theodore Efremov's avatar Theodore Efremov :hibiscus:
Browse files

[AlPhaPha] Adjusted project compatibility with new exogam code

parent 04d62006
No related branches found
No related tags found
No related merge requests found
Pipeline #393706 passed
Stage: build-NPLib
Stage: build-NPSimulation
Stage: test
Hide whitespace changes
Inline Side-by-side
Projects/AlPhaPha/2024/Analysis.cxx
+ 3
− 3
View file @ 981606c9
...@@ -175,10 +175,10 @@ void Analysis::ExogamAnalysis(){ ...@@ -175,10 +175,10 @@ void Analysis::ExogamAnalysis(){
if(FF_Theta!=-100){ if(FF_Theta!=-100){
Exo_cosa = sin(FF_Theta)*cos(FF_Phi)*sin(Exo_Theta)*cos(Exo_Phi) + sin(FF_Theta)*sin(FF_Phi)*sin(Exo_Theta)*sin(Exo_Phi) + cos(FF_Theta)*cos(Exo_Theta); Exo_cosa = sin(FF_Theta)*cos(FF_Phi)*sin(Exo_Theta)*cos(Exo_Phi) + sin(FF_Theta)*sin(FF_Phi)*sin(Exo_Theta)*sin(Exo_Phi) + cos(FF_Theta)*cos(Exo_Theta);
//Exo_cosa = sin(0)*cos(0)*sin(Exo_Theta)*cos(Exo_Phi) + sin(0)*sin(0)*sin(Exo_Theta)*sin(Exo_Phi) + cos(0)*cos(Exo_Theta); //Exo_cosa = sin(0)*cos(0)*sin(Exo_Theta)*cos(Exo_Phi) + sin(0)*sin(0)*sin(Exo_Theta)*sin(Exo_Phi) + cos(0)*cos(Exo_Theta);
Exo_EDC_vamos = EXOGAM->CorrectionDoppler(Exo_Theta,Exo_Phi,FF_Theta,FF_Phi,FF_Beta13,Exo_E); Exo_EDC_vamos = EXOGAM->DopplerCorrection(Exo_E,Exo_Theta,Exo_Phi,FF_Theta,FF_Phi,FF_Beta13);
}//FFTheta }//FFTheta
if(ThetaLab!=-1000){ if(ThetaLab!=-1000){
Exo_EDC_pista = EXOGAM->CorrectionDoppler(Exo_Theta,Exo_Phi,ThetaLab,PhiLab,Beta_pista,Exo_E); Exo_EDC_pista = EXOGAM->DopplerCorrection(Exo_E,Exo_Theta,Exo_Phi,ThetaLab,PhiLab,Beta_pista);
}//Thetalab }//Thetalab
}//ExoTheta }//ExoTheta
} //Size } //Size
...@@ -270,7 +270,7 @@ void Analysis::PistaAnalysis(){ ...@@ -270,7 +270,7 @@ void Analysis::PistaAnalysis(){
Beta_pista = Be10->GetBeta(); Beta_pista = Be10->GetBeta();
Ex240Pu = Transfer10Be->ReconstructRelativistic(Elab_10Be, ThetaLab); Ex240Pu = Transfer10Be->ReconstructRelativistic(Elab_10Be, ThetaLab);
TLorentzVector LV_240Pu = Transfer10Be->LorentzAfterReaction(Elab_10Be, ThetaLab); TLorentzVector LV_240Pu = Transfer10Be->LorentzAfterReactionHeavy(Elab_10Be, ThetaLab);
beta_240Pu = LV_240Pu.Beta(); beta_240Pu = LV_240Pu.Beta();
gamma_240Pu = LV_240Pu.Gamma(); gamma_240Pu = LV_240Pu.Gamma();
theta_240Pu = LV_240Pu.Angle(TVector3(0,0,1)); theta_240Pu = LV_240Pu.Angle(TVector3(0,0,1));
......
Projects/AlPhaPha/2024/configs/ConfigExogam.dat
+ 1
− 13
View file @ 981606c9
ConfigExogam ConfigExogam
TDC_THRESHOLDS -10 500000 TDC_THRESHOLDS 0 500000
DATA_IS_CAL 1 DATA_IS_CAL 1
MAP_EXO 12 3 0
MAP_EXO 13 3 1
MAP_EXO 14 3 2
MAP_EXO 15 3 3
MAP_EXO 16 4 0
MAP_EXO 17 4 1
MAP_EXO 18 4 2
MAP_EXO 19 4 3
MAP_EXO 20 5 0
MAP_EXO 21 5 1
MAP_EXO 22 5 2
MAP_EXO 23 5 3
Projects/AlPhaPha/2024/pista_e850_2024.detector
+ 60
− 48
View file @ 981606c9
...@@ -11,64 +11,76 @@ Target ...@@ -11,64 +11,76 @@ Target
% flange3 % flange3
Exogam Exogam
FLANGE= 3 FLANGE= 3
POS_CRYSTALA_SEG1= -162.118378 -36.270000 -110.824844 CrystalA= 12
POS_CRYSTALA_SEG2= -144.666977 -36.270000 -128.276245 CrystalB= 13
POS_CRYSTALA_SEG3= -144.666977 -11.590000 -128.276245 CrystalC= 14
POS_CRYSTALA_SEG4= -162.118378 -11.590000 -110.824844 CrystalD= 15
POS_CRYSTALB_SEG1= -110.824844 -36.270000 -162.118378 CrystalA_Seg1= -162.118378 -36.270000 -110.824844
POS_CRYSTALB_SEG2= -110.824844 -11.590000 -162.118378 CrystalA_Seg2= -144.666977 -36.270000 -128.276245
POS_CRYSTALB_SEG3= -128.276245 -11.590000 -144.666977 CrystalA_Seg3= -144.666977 -11.590000 -128.276245
POS_CRYSTALB_SEG4= -128.276245 -36.270000 -144.666977 CrystalA_Seg4= -162.118378 -11.590000 -110.824844
POS_CRYSTALC_SEG1= -110.824844 36.270000 -162.118378 CrystalB_Seg1= -110.824844 -36.270000 -162.118378
POS_CRYSTALC_SEG2= -128.276245 36.270000 -144.666977 CrystalB_Seg2= -110.824844 -11.590000 -162.118378
POS_CRYSTALC_SEG3= -128.276245 11.590000 -144.666977 CrystalB_Seg3= -128.276245 -11.590000 -144.666977
POS_CRYSTALC_SEG4= -110.824844 11.590000 -162.118378 CrystalB_Seg4= -128.276245 -36.270000 -144.666977
POS_CRYSTALD_SEG1= -162.118378 36.270000 -110.824844 CrystalC_Seg1= -110.824844 36.270000 -162.118378
POS_CRYSTALD_SEG2= -162.118378 11.590000 -110.824844 CrystalC_Seg2= -128.276245 36.270000 -144.666977
POS_CRYSTALD_SEG3= -144.666977 11.590000 -128.276245 CrystalC_Seg3= -128.276245 11.590000 -144.666977
POS_CRYSTALD_SEG4= -144.666977 36.270000 -128.276245 CrystalC_Seg4= -110.824844 11.590000 -162.118378
CrystalD_Seg1= -162.118378 36.270000 -110.824844
CrystalD_Seg2= -162.118378 11.590000 -110.824844
CrystalD_Seg3= -144.666977 11.590000 -128.276245
CrystalD_Seg4= -144.666977 36.270000 -128.276245
%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%
% flange4 % flange4
Exogam Exogam
FLANGE= 4 FLANGE= 4
POS_CRYSTALA_SEG1= -36.270000 150.422821 -201.716354 CrystalA= 16
POS_CRYSTALA_SEG2= -11.590000 150.422821 -201.716354 CrystalB= 17
POS_CRYSTALA_SEG3= -11.590000 167.874222 -184.264954 CrystalC= 18
POS_CRYSTALA_SEG4= -36.270000 167.874222 -184.264954 CrystalD= 19
POS_CRYSTALB_SEG1= 36.270000 150.422821 -201.716354 CrystalA_Seg1= -36.270000 150.422821 -201.716354
POS_CRYSTALB_SEG2= 36.270000 167.874222 -184.264954 CrystalA_Seg2= -11.590000 150.422821 -201.716354
POS_CRYSTALB_SEG3= 11.590000 167.874222 -184.264954 CrystalA_Seg3= -11.590000 167.874222 -184.264954
POS_CRYSTALB_SEG4= 11.590000 150.422821 -201.716354 CrystalA_Seg4= -36.270000 167.874222 -184.264954
POS_CRYSTALC_SEG1= 36.270000 201.716354 -150.422821 CrystalB_Seg1= 36.270000 150.422821 -201.716354
POS_CRYSTALC_SEG2= 11.590000 201.716354 -150.422821 CrystalB_Seg2= 36.270000 167.874222 -184.264954
POS_CRYSTALC_SEG3= 11.590000 184.264954 -167.874222 CrystalB_Seg3= 11.590000 167.874222 -184.264954
POS_CRYSTALC_SEG4= 36.270000 184.264954 -167.874222 CrystalB_Seg4= 11.590000 150.422821 -201.716354
POS_CRYSTALD_SEG1= -36.270000 201.716354 -150.422821 CrystalC_Seg1= 36.270000 201.716354 -150.422821
POS_CRYSTALD_SEG2= -36.270000 184.264954 -167.874222 CrystalC_Seg2= 11.590000 201.716354 -150.422821
POS_CRYSTALD_SEG3= -11.590000 184.264954 -167.874222 CrystalC_Seg3= 11.590000 184.264954 -167.874222
POS_CRYSTALD_SEG4= -11.590000 201.716354 -150.422821 CrystalC_Seg4= 36.270000 184.264954 -167.874222
CrystalD_Seg1= -36.270000 201.716354 -150.422821
CrystalD_Seg2= -36.270000 184.264954 -167.874222
CrystalD_Seg3= -11.590000 184.264954 -167.874222
CrystalD_Seg4= -11.590000 201.716354 -150.422821
%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%
% flange5 % flange5
Exogam Exogam
FLANGE= 5 FLANGE= 5
POS_CRYSTALA_SEG1= -36.270000 -159.289948 -107.996422 CrystalA= 20
POS_CRYSTALA_SEG2= -11.590000 -159.289948 -107.996422 CrystalB= 21
POS_CRYSTALA_SEG3= -11.590000 -141.838547 -125.447815 CrystalC= 22
POS_CRYSTALA_SEG4= -36.270000 -141.838547 -125.447815 CrystalD= 23
POS_CRYSTALB_SEG1= 36.270000 -159.289948 -107.996422 CrystalA_Seg1= -36.270000 -159.289948 -107.996422
POS_CRYSTALB_SEG2= 36.270000 -141.838547 -125.447815 CrystalA_Seg2= -11.590000 -159.289948 -107.996422
POS_CRYSTALB_SEG3= 11.590000 -141.838547 -125.447815 CrystalA_Seg3= -11.590000 -141.838547 -125.447815
POS_CRYSTALB_SEG4= 11.590000 -159.289948 -107.996422 CrystalA_Seg4= -36.270000 -141.838547 -125.447815
POS_CRYSTALC_SEG1= 36.270000 -107.996422 -159.289948 CrystalB_Seg1= 36.270000 -159.289948 -107.996422
POS_CRYSTALC_SEG2= 11.590000 -107.996422 -159.289948 CrystalB_Seg2= 36.270000 -141.838547 -125.447815
POS_CRYSTALC_SEG3= 11.590000 -125.447815 -141.838547 CrystalB_Seg3= 11.590000 -141.838547 -125.447815
POS_CRYSTALC_SEG4= 36.270000 -125.447815 -141.838547 CrystalB_Seg4= 11.590000 -159.289948 -107.996422
POS_CRYSTALD_SEG1= -36.270000 -107.996422 -159.289948 CrystalC_Seg1= 36.270000 -107.996422 -159.289948
POS_CRYSTALD_SEG2= -36.270000 -125.447815 -141.838547 CrystalC_Seg2= 11.590000 -107.996422 -159.289948
POS_CRYSTALD_SEG3= -11.590000 -125.447815 -141.838547 CrystalC_Seg3= 11.590000 -125.447815 -141.838547
POS_CRYSTALD_SEG4= -11.590000 -107.996422 -159.289948 CrystalC_Seg4= 36.270000 -125.447815 -141.838547
CrystalD_Seg1= -36.270000 -107.996422 -159.289948
CrystalD_Seg2= -36.270000 -125.447815 -141.838547
CrystalD_Seg3= -11.590000 -125.447815 -141.838547
CrystalD_Seg4= -11.590000 -107.996422 -159.289948
%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%
......
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