Skip to content
Snippets Groups Projects
Commit 551ef1da authored by Pierre Morfouace's avatar Pierre Morfouace
Browse files

updating e850 project

parent c2c28fe8
No related branches found
No related tags found
1 merge request!27Draft: [Epic] Preparation of the environement for the new GaseousDetectorScorers...
Pipeline #336651 passed
...@@ -401,6 +401,8 @@ void Analysis::VamosAnalysis(){ ...@@ -401,6 +401,8 @@ void Analysis::VamosAnalysis(){
// T13 // // T13 //
double path1 = FPMW->GetDetectorPositionZ(0)/10./cos(FPMW->Theta_in)/cos(FPMW->Phi_in); double path1 = FPMW->GetDetectorPositionZ(0)/10./cos(FPMW->Theta_in)/cos(FPMW->Phi_in);
double path2 = (FPMW->GetDetectorPositionZ(2)-7600)/10./cos(FPMW->Thetaf); double path2 = (FPMW->GetDetectorPositionZ(2)-7600)/10./cos(FPMW->Thetaf);
FF_Y1 = FPMW->PositionY[0];
FF_Y3 = FPMW->PositionY[2];
FF_D13 = FF_Path - path1 + path2; FF_D13 = FF_Path - path1 + path2;
FF_T13 = T13 - 20 + m_T13_Offset[FPMWPat]; FF_T13 = T13 - 20 + m_T13_Offset[FPMWPat];
FF_V13 = FF_D13/FF_T13; FF_V13 = FF_D13/FF_T13;
...@@ -526,6 +528,8 @@ void Analysis::InitOutputBranch(){ ...@@ -526,6 +528,8 @@ void Analysis::InitOutputBranch(){
RootOutput::getInstance()->GetTree()->Branch("FF_Brho",&FF_Brho,"FF_Brho/D"); RootOutput::getInstance()->GetTree()->Branch("FF_Brho",&FF_Brho,"FF_Brho/D");
RootOutput::getInstance()->GetTree()->Branch("FF_Path",&FF_Path,"FF_Path/D"); RootOutput::getInstance()->GetTree()->Branch("FF_Path",&FF_Path,"FF_Path/D");
RootOutput::getInstance()->GetTree()->Branch("FF_Y1",&FF_Y1,"FF_Y1/D");
RootOutput::getInstance()->GetTree()->Branch("FF_Y3",&FF_Y3,"FF_Y3/D");
RootOutput::getInstance()->GetTree()->Branch("FF_D13",&FF_D13,"FF_D13/D"); RootOutput::getInstance()->GetTree()->Branch("FF_D13",&FF_D13,"FF_D13/D");
RootOutput::getInstance()->GetTree()->Branch("FF_T13",&FF_T13,"FF_T13/D"); RootOutput::getInstance()->GetTree()->Branch("FF_T13",&FF_T13,"FF_T13/D");
RootOutput::getInstance()->GetTree()->Branch("FF_V13",&FF_V13,"FF_V13/D"); RootOutput::getInstance()->GetTree()->Branch("FF_V13",&FF_V13,"FF_V13/D");
...@@ -650,6 +654,8 @@ void Analysis::ReInitValue(){ ...@@ -650,6 +654,8 @@ void Analysis::ReInitValue(){
FF_Phi = -100; FF_Phi = -100;
FF_Brho = -1; FF_Brho = -1;
FF_Path = -1; FF_Path = -1;
FF_Y1 = -1000;
FF_Y3 = -1000;
FF_D13 = -1; FF_D13 = -1;
FF_T13 = -1; FF_T13 = -1;
FF_V13 = -1; FF_V13 = -1;
......
...@@ -110,6 +110,8 @@ class Analysis: public NPL::VAnalysis{ ...@@ -110,6 +110,8 @@ class Analysis: public NPL::VAnalysis{
double FF_Theta; double FF_Theta;
double FF_Phi; double FF_Phi;
double FF_Y1;
double FF_Y3;
double FF_D13; double FF_D13;
double FF_T13; double FF_T13;
double FF_V13; double FF_V13;
......
...@@ -7,18 +7,7 @@ CalibrationFilePath ...@@ -7,18 +7,7 @@ CalibrationFilePath
./Calibration/pista/e850_2023/part1/lucas/PISTA6_DE.cal ./Calibration/pista/e850_2023/part1/lucas/PISTA6_DE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA7_DE.cal ./Calibration/pista/e850_2023/part1/lucas/PISTA7_DE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA8_DE.cal ./Calibration/pista/e850_2023/part1/lucas/PISTA8_DE.cal
%./Calibration/pista/e850_2023/part1/lucas/pol2/PISTA1_backE.cal
%./Calibration/pista/e850_2023/part1/lucas/pol2/PISTA2_backE.cal
%./Calibration/pista/e850_2023/part1/lucas/pol2/PISTA3_backE.cal
%./Calibration/pista/e850_2023/part1/lucas/pol2/PISTA4_backE.cal
%./Calibration/pista/e850_2023/part1/lucas/pol2/PISTA5_backE.cal
%./Calibration/pista/e850_2023/part1/lucas/pol2/PISTA6_backE.cal
%./Calibration/pista/e850_2023/part1/lucas/pol2/PISTA7_backE.cal
%./Calibration/pista/e850_2023/part1/lucas/pol2/PISTA8_backE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA_BACK_E_pol1.cal ./Calibration/pista/e850_2023/part1/lucas/PISTA_BACK_E_pol1.cal
%./Calibration/pista/e850_2023/part1/PISTA_BACK_DE.cal
%./Calibration/pista/e850_2023/part1/PISTA_BACK_E_min.cal
./Calibration/VAMOS/CHIO/Chio_E_sec4.cal ./Calibration/VAMOS/CHIO/Chio_E_sec4.cal
./Calibration/VAMOS/CHIO/Chio_E_sec5.cal ./Calibration/VAMOS/CHIO/Chio_E_sec5.cal
......
CalibrationFilePath
./Calibration/pista/e850_2023/part1/lucas/PISTA1_DE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA2_DE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA3_DE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA4_DE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA5_DE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA6_DE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA7_DE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA8_DE.cal
./Calibration/pista/e850_2023/part1/lucas/PISTA_BACK_E_pol1.cal
./Calibration/VAMOS/CHIO/Chio_E_sec4.cal
./Calibration/VAMOS/CHIO/Chio_E_sec5.cal
./Calibration/VAMOS/CHIO/Chio_E_sec6.cal
./Calibration/VAMOS/CHIO/Chio_E_sec7.cal
./Calibration/VAMOS/CHIO/Chio_E_sec8.cal
./Calibration/VAMOS/CHIO/Chio_E_sec9.cal
./Calibration/VAMOS/CHIO/Chio_E_sec10.cal
./Calibration/VAMOS/CHIO/Chio_E_sec11.cal
./Calibration/VAMOS/CHIO/Chio_E_sec12.cal
./Calibration/VAMOS/CHIO/Chio_E_sec13.cal
./Calibration/VAMOS/CHIO/Chio_E_sec14.cal
./Calibration/VAMOS/CHIO/Chio_E_sec15.cal
./Calibration/VAMOS/CHIO/Chio_E_sec16.cal
./Calibration/VAMOS/CHIO/Chio_E_sec17.cal
./Calibration/VAMOS/CHIO/Chio_E_sec18.cal
./Calibration/VAMOS/CHIO/Chio_E_sec19.cal
./Calibration/VAMOS/FPMW/npformat/FPMW1_X.cal
./Calibration/VAMOS/FPMW/npformat/FPMW1_Y.cal
./Calibration/VAMOS/FPMW/npformat/FPMW2_X.cal
./Calibration/VAMOS/FPMW/npformat/FPMW2_Y.cal
./Calibration/VAMOS/FPMW/npformat/FPMW3_X.cal
./Calibration/VAMOS/FPMW/npformat/FPMW3_Y.cal
./Calibration/VAMOS/FPMW/npformat/FPMW4_X.cal
./Calibration/VAMOS/FPMW/npformat/FPMW4_Y.cal
CalibrationFilePath
./Calibration/pista/e850_2023/part2/lucas/PISTA1_DE.cal
./Calibration/pista/e850_2023/part2/lucas/PISTA2_DE.cal
./Calibration/pista/e850_2023/part2/lucas/PISTA3_DE.cal
./Calibration/pista/e850_2023/part2/lucas/PISTA4_DE.cal
./Calibration/pista/e850_2023/part2/lucas/PISTA5_DE.cal
./Calibration/pista/e850_2023/part2/lucas/PISTA6_DE.cal
./Calibration/pista/e850_2023/part2/lucas/PISTA7_DE.cal
./Calibration/pista/e850_2023/part2/lucas/PISTA8_DE.cal
./Calibration/pista/e850_2023/part2/lucas/PISTA_BACK_E_pol1.cal
./Calibration/VAMOS/CHIO/Chio_E_sec4.cal
./Calibration/VAMOS/CHIO/Chio_E_sec5.cal
./Calibration/VAMOS/CHIO/Chio_E_sec6.cal
./Calibration/VAMOS/CHIO/Chio_E_sec7.cal
./Calibration/VAMOS/CHIO/Chio_E_sec8.cal
./Calibration/VAMOS/CHIO/Chio_E_sec9.cal
./Calibration/VAMOS/CHIO/Chio_E_sec10.cal
./Calibration/VAMOS/CHIO/Chio_E_sec11.cal
./Calibration/VAMOS/CHIO/Chio_E_sec12.cal
./Calibration/VAMOS/CHIO/Chio_E_sec13.cal
./Calibration/VAMOS/CHIO/Chio_E_sec14.cal
./Calibration/VAMOS/CHIO/Chio_E_sec15.cal
./Calibration/VAMOS/CHIO/Chio_E_sec16.cal
./Calibration/VAMOS/CHIO/Chio_E_sec17.cal
./Calibration/VAMOS/CHIO/Chio_E_sec18.cal
./Calibration/VAMOS/CHIO/Chio_E_sec19.cal
./Calibration/VAMOS/FPMW/npformat/FPMW1_X.cal
./Calibration/VAMOS/FPMW/npformat/FPMW1_Y.cal
./Calibration/VAMOS/FPMW/npformat/FPMW2_X.cal
./Calibration/VAMOS/FPMW/npformat/FPMW2_Y.cal
./Calibration/VAMOS/FPMW/npformat/FPMW3_X.cal
./Calibration/VAMOS/FPMW/npformat/FPMW3_Y.cal
./Calibration/VAMOS/FPMW/npformat/FPMW4_X.cal
./Calibration/VAMOS/FPMW/npformat/FPMW4_Y.cal
...@@ -14,8 +14,13 @@ void convert(int run=43){ ...@@ -14,8 +14,13 @@ void convert(int run=43){
// output tree // // output tree //
TString output_path = "/home/morfouacep/Physics/ganil/pista/analysisenv-e850-2023/np_raw/"; TString output_path;
TString filename = output_path+Form("run_raw_%i.root",run); if(run<54)
output_path = "/home/morfouacep/Physics/ganil/pista/analysisenv-e850-2023/np_raw/part1/";
else
output_path = "/home/morfouacep/Physics/ganil/pista/analysisenv-e850-2023/np_raw/part2/";
TString filename = output_path+Form("run_%i.root",run);
TFile* ofile = TFile::Open(filename,"recreate"); TFile* ofile = TFile::Open(filename,"recreate");
TTree* output_tree = new TTree("RawTree","RawTree"); TTree* output_tree = new TTree("RawTree","RawTree");
//InitOutputTree(); //InitOutputTree();
......
...@@ -11,7 +11,7 @@ void LoadCut(string part){ ...@@ -11,7 +11,7 @@ void LoadCut(string part){
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
void FillHistoMass(string part="part2"){ void FillHistoMass(string part="part1"){
LoadCut(part); LoadCut(part);
...@@ -25,7 +25,6 @@ void FillHistoMass(string part="part2"){ ...@@ -25,7 +25,6 @@ void FillHistoMass(string part="part2"){
chain->Add("../../root/analysis/run_36.root"); chain->Add("../../root/analysis/run_36.root");
chain->Add("../../root/analysis/run_37.root"); chain->Add("../../root/analysis/run_37.root");
chain->Add("../../root/analysis/run_39.root"); chain->Add("../../root/analysis/run_39.root");
chain->Add("../../root/analysis/run_40.root");
chain->Add("../../root/analysis/run_41.root"); chain->Add("../../root/analysis/run_41.root");
chain->Add("../../root/analysis/run_42.root"); chain->Add("../../root/analysis/run_42.root");
chain->Add("../../root/analysis/run_43.root"); chain->Add("../../root/analysis/run_43.root");
...@@ -60,23 +59,24 @@ void FillHistoMass(string part="part2"){ ...@@ -60,23 +59,24 @@ void FillHistoMass(string part="part2"){
double Elab; double Elab;
double Mass; double Mass;
double Ex240Pu; double Ex240Pu;
double fTS_TMW; double VAMOS_TS_hour;
int Telescope; int Telescope;
int m_2alpha;
chain->SetBranchStatus("DeltaEcorr","true"); chain->SetBranchStatus("DeltaEcorr","true");
chain->SetBranchAddress("DeltaEcorr",&DeltaEcorr); chain->SetBranchAddress("DeltaEcorr",&DeltaEcorr);
chain->SetBranchStatus("Elab","true"); chain->SetBranchStatus("Elab","true");
chain->SetBranchAddress("Elab",&Elab); chain->SetBranchAddress("Elab",&Elab);
chain->SetBranchStatus("Mass","true"); chain->SetBranchStatus("FF_Mass13","true");
chain->SetBranchAddress("Mass",&Mass); chain->SetBranchAddress("FF_Mass13",&Mass);
chain->SetBranchStatus("Ex240Pu","true"); chain->SetBranchStatus("Ex240Pu","true");
chain->SetBranchAddress("Ex240Pu",&Ex240Pu); chain->SetBranchAddress("Ex240Pu",&Ex240Pu);
chain->SetBranchStatus("fTS_TMW","true"); chain->SetBranchStatus("VAMOS_TS_hour","true");
chain->SetBranchAddress("fTS_TMW",&fTS_TMW); chain->SetBranchAddress("VAMOS_TS_hour",&VAMOS_TS_hour);
chain->SetBranchStatus("Telescope","true"); chain->SetBranchStatus("Telescope","true");
chain->SetBranchAddress("Telescope",&Telescope); chain->SetBranchAddress("Telescope",&Telescope);
chain->SetBranchStatus("m_2alpha","true");
chain->SetBranchAddress("m_2alpha",&m_2alpha);
TH1F *hmass[11]; TH1F *hmass[11];
TH2F *hPID[8]; TH2F *hPID[8];
...@@ -101,24 +101,26 @@ void FillHistoMass(string part="part2"){ ...@@ -101,24 +101,26 @@ void FillHistoMass(string part="part2"){
cout << "\033[34m\r Processing tree..." << (double)i/nentries*100 << "\% done" << flush; cout << "\033[34m\r Processing tree..." << (double)i/nentries*100 << "\% done" << flush;
} }
if(fTS_TMW>0){ if(VAMOS_TS_hour>0){
if(Telescope>0) hPID[Telescope-1]->Fill(Elab,DeltaEcorr); if(Telescope>0) {
if(m_2alpha==0) hPID[Telescope-1]->Fill(Elab,DeltaEcorr);
if(cut10Be[Telescope-1]->IsInside(Elab,DeltaEcorr)){
hEx->Fill(Ex240Pu); if(cut10Be[Telescope-1]->IsInside(Elab,DeltaEcorr)){
hMassAll->Fill(Mass); hEx->Fill(Ex240Pu);
if(Ex240Pu>5.5 && Ex240Pu<6.5) hmass[0]->Fill(Mass); hMassAll->Fill(Mass);
else if(Ex240Pu>6.5 && Ex240Pu<7.5) hmass[1]->Fill(Mass); if(Ex240Pu>5.5 && Ex240Pu<6.5) hmass[0]->Fill(Mass);
else if(Ex240Pu>7.5 && Ex240Pu<8.5) hmass[2]->Fill(Mass); else if(Ex240Pu>6.5 && Ex240Pu<7.5) hmass[1]->Fill(Mass);
else if(Ex240Pu>8.5 && Ex240Pu<9.5) hmass[3]->Fill(Mass); else if(Ex240Pu>7.5 && Ex240Pu<8.5) hmass[2]->Fill(Mass);
else if(Ex240Pu>9.5 && Ex240Pu<10.5) hmass[4]->Fill(Mass); else if(Ex240Pu>8.5 && Ex240Pu<9.5) hmass[3]->Fill(Mass);
else if(Ex240Pu>10.5 && Ex240Pu<11.5) hmass[5]->Fill(Mass); else if(Ex240Pu>9.5 && Ex240Pu<10.5) hmass[4]->Fill(Mass);
else if(Ex240Pu>11.5 && Ex240Pu<12.5) hmass[6]->Fill(Mass); else if(Ex240Pu>10.5 && Ex240Pu<11.5) hmass[5]->Fill(Mass);
else if(Ex240Pu>12.5 && Ex240Pu<13.5) hmass[7]->Fill(Mass); else if(Ex240Pu>11.5 && Ex240Pu<12.5) hmass[6]->Fill(Mass);
else if(Ex240Pu>13.5 && Ex240Pu<14.5) hmass[8]->Fill(Mass); else if(Ex240Pu>12.5 && Ex240Pu<13.5) hmass[7]->Fill(Mass);
else if(Ex240Pu>14.5 && Ex240Pu<15.5) hmass[9]->Fill(Mass); else if(Ex240Pu>13.5 && Ex240Pu<14.5) hmass[8]->Fill(Mass);
else if(Ex240Pu>15.5 && Ex240Pu<16.5) hmass[10]->Fill(Mass); else if(Ex240Pu>14.5 && Ex240Pu<15.5) hmass[9]->Fill(Mass);
else if(Ex240Pu>15.5 && Ex240Pu<16.5) hmass[10]->Fill(Mass);
}
} }
} }
} }
......
...@@ -4,7 +4,8 @@ TFile* ofile; ...@@ -4,7 +4,8 @@ TFile* ofile;
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
void FitMass(){ void FitMass(){
TFile* ifile = new TFile("histo_mass_all.root","read"); //TFile* ifile = new TFile("histo_mass_all.root","read");
TFile* ifile = new TFile("histo_mass_part1.root","read");
ofile = new TFile("histo_mass_fitted.root","recreate"); ofile = new TFile("histo_mass_fitted.root","recreate");
......
Project e850 Project e850
AnalysisOutput= ./root/analysis AnalysisOutput= ../../../../../../../../
SimulationOutput= ./root/simulation SimulationOutput= ./root/simulation
EnergyLoss= ./EnergyLossTable EnergyLoss= ./EnergyLossTable
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment