Commit e356a684 authored by Jérémie Dudouet's avatar Jérémie Dudouet
Browse files

Add a light mode which process only the most important histograms

parent 20e6c971
...@@ -47,6 +47,9 @@ TreeName TreeMaster ...@@ -47,6 +47,9 @@ TreeName TreeMaster
# #
FileNameOut Auto FileNameOut Auto
### Light mode keep only the most usefull histograms, comment to ignore
#LighMode
### Remove Histograms with stat lower or equal than StatMin ### Remove Histograms with stat lower or equal than StatMin
#StatMin 1000 #StatMin 1000
......
...@@ -65,6 +65,7 @@ void SetProofGlobalValues() ...@@ -65,6 +65,7 @@ void SetProofGlobalValues()
fProof->SetParameter("NedaTimeGateFormula",(TString)fNedaTimeGateFormula); fProof->SetParameter("NedaTimeGateFormula",(TString)fNedaTimeGateFormula);
fProof->SetParameter("DiamantTimeGateFormula",(TString)fDiamantTimeGateFormula); fProof->SetParameter("DiamantTimeGateFormula",(TString)fDiamantTimeGateFormula);
fProof->SetParameter("StatMin",(Int_t)fStatMin); fProof->SetParameter("StatMin",(Int_t)fStatMin);
fProof->SetParameter("LightMode",(Int_t)fLightMode);
} }
void SetStandardGlobalValues() void SetStandardGlobalValues()
...@@ -83,6 +84,7 @@ void SetStandardGlobalValues() ...@@ -83,6 +84,7 @@ void SetStandardGlobalValues()
gEnv->SetValue("NedaTimeGateFormula", (TString)fNedaTimeGateFormula); gEnv->SetValue("NedaTimeGateFormula", (TString)fNedaTimeGateFormula);
gEnv->SetValue("DiamantTimeGateFormula", (TString)fDiamantTimeGateFormula); gEnv->SetValue("DiamantTimeGateFormula", (TString)fDiamantTimeGateFormula);
gEnv->SetValue("StatMin", (Int_t)fStatMin); gEnv->SetValue("StatMin", (Int_t)fStatMin);
gEnv->SetValue("LightMode", (Int_t)fLightMode);
} }
void ReadChain() void ReadChain()
...@@ -236,13 +238,13 @@ void ReadConfFile() ...@@ -236,13 +238,13 @@ void ReadConfFile()
delete loa; delete loa;
loa=Buffer.Tokenize(","); loa=Buffer.Tokenize(",");
cout<<"List of runs = "; cout<<"\e[1;92mList of runs = ";
for(int i=0 ; i<loa->GetEntries() ; i++) for(int i=0 ; i<loa->GetEntries() ; i++)
{ {
runs.push_back(((TString)loa->At(i)->GetName()).Atoi()); runs.push_back(((TString)loa->At(i)->GetName()).Atoi());
cout<<runs[i]<<" "; cout<<runs[i]<<" ";
} }
cout<<endl; cout<<"\e[0m"<<endl;
delete loa; delete loa;
} }
else if(Buffer.BeginsWith("ListOfRuns")) else if(Buffer.BeginsWith("ListOfRuns"))
...@@ -257,19 +259,19 @@ void ReadConfFile() ...@@ -257,19 +259,19 @@ void ReadConfFile()
Int_t LastRun = ((TString)loa->Last()->GetName()).Atoi(); Int_t LastRun = ((TString)loa->Last()->GetName()).Atoi();
delete loa; delete loa;
cout<<"List of runs : all existing runs from "<<FirstRun<<" to "<<LastRun<<endl; cout<<"\e[1;92mList of runs : all existing runs from "<<FirstRun<<" to "<<LastRun<<endl;
for(int i=FirstRun ; i<=LastRun ; i++) for(int i=FirstRun ; i<=LastRun ; i++)
{ {
runs.push_back(i); runs.push_back(i);
} }
cout<<endl; cout<<"\e[0m"<<endl;
} }
if(Buffer.BeginsWith("DataFolder")) if(Buffer.BeginsWith("DataFolder"))
{ {
TObjArray *loa=Buffer.Tokenize(" "); TObjArray *loa=Buffer.Tokenize(" ");
fDataFolder = ((TString)loa->At(1)->GetName()); fDataFolder = ((TString)loa->At(1)->GetName());
delete loa; delete loa;
cout<<"Data Folder = "<<fDataFolder<<endl; cout<<"\e[1;92mData Folder = "<<fDataFolder<<"\e[0m"<<endl;
} }
if(Buffer.BeginsWith("BaseRootFileName")) if(Buffer.BeginsWith("BaseRootFileName"))
{ {
...@@ -299,14 +301,14 @@ void ReadConfFile() ...@@ -299,14 +301,14 @@ void ReadConfFile()
delete loa; delete loa;
} }
cout<<"Output FileName = "<<fFileNameOut<<endl; cout<<"\e[1;92mOutput FileName = "<<fFileNameOut<<"\e[0m"<<endl;
} }
if(Buffer.BeginsWith("DiamantLookUpTable")) if(Buffer.BeginsWith("DiamantLookUpTable"))
{ {
TObjArray *loa=Buffer.Tokenize(" "); TObjArray *loa=Buffer.Tokenize(" ");
fDiamantLookUpTable = ((TString)loa->At(1)->GetName()); fDiamantLookUpTable = ((TString)loa->At(1)->GetName());
delete loa; delete loa;
cout<<"DiamantLookUpTable = "<<fDiamantLookUpTable<<endl; cout<<"\e[1;92mDiamantLookUpTable = "<<fDiamantLookUpTable<<"\e[0m"<<endl;
} }
if(Buffer.BeginsWith("DiamantTSPeaks")) if(Buffer.BeginsWith("DiamantTSPeaks"))
{ {
...@@ -320,21 +322,21 @@ void ReadConfFile() ...@@ -320,21 +322,21 @@ void ReadConfFile()
TObjArray *loa=Buffer.Tokenize(" "); TObjArray *loa=Buffer.Tokenize(" ");
fDiamantCutsLocation = ((TString)loa->At(1)->GetName()); fDiamantCutsLocation = ((TString)loa->At(1)->GetName());
delete loa; delete loa;
cout<<"DiamantCutsLocation = "<<fDiamantCutsLocation<<endl; cout<<"\e[1;92mDiamantCutsLocation = "<<fDiamantCutsLocation<<"\e[0m"<<endl;
} }
if(Buffer.BeginsWith("NedaLookUpTable")) if(Buffer.BeginsWith("NedaLookUpTable"))
{ {
TObjArray *loa=Buffer.Tokenize(" "); TObjArray *loa=Buffer.Tokenize(" ");
fNedaLookUpTable = ((TString)loa->At(1)->GetName()); fNedaLookUpTable = ((TString)loa->At(1)->GetName());
delete loa; delete loa;
cout<<"NedaLookUpTable = "<<fNedaLookUpTable<<endl; cout<<"\e[1;92mNedaLookUpTable = "<<fNedaLookUpTable<<"\e[0m"<<endl;
} }
if(Buffer.BeginsWith("NedaCutsLocation")) if(Buffer.BeginsWith("NedaCutsLocation"))
{ {
TObjArray *loa=Buffer.Tokenize(" "); TObjArray *loa=Buffer.Tokenize(" ");
fNedaCutsLocation = ((TString)loa->At(1)->GetName()); fNedaCutsLocation = ((TString)loa->At(1)->GetName());
delete loa; delete loa;
cout<<"NedaCutsLocation = "<<fNedaCutsLocation<<endl; cout<<"\e[1;92mNedaCutsLocation = "<<fNedaCutsLocation<<"\e[0m"<<endl;
} }
if(Buffer.BeginsWith("SpecificFile")) if(Buffer.BeginsWith("SpecificFile"))
{ {
...@@ -353,21 +355,26 @@ void ReadConfFile() ...@@ -353,21 +355,26 @@ void ReadConfFile()
TObjArray *loa=Buffer.Tokenize(" "); TObjArray *loa=Buffer.Tokenize(" ");
fNedaTimeGateFormula = Form("%s;%s",loa->At(1)->GetName(),loa->At(2)->GetName()); fNedaTimeGateFormula = Form("%s;%s",loa->At(1)->GetName(),loa->At(2)->GetName());
delete loa; delete loa;
cout<<"NedaTimeGate (min;max) = ("<<fNedaTimeGateFormula<<")"<<endl; cout<<"\e[1;92mNedaTimeGate (min;max) = ("<<fNedaTimeGateFormula<<")\e[0m"<<endl;
} }
if(Buffer.BeginsWith("DiamantTimeGate")) if(Buffer.BeginsWith("DiamantTimeGate"))
{ {
TObjArray *loa=Buffer.Tokenize(" "); TObjArray *loa=Buffer.Tokenize(" ");
fDiamantTimeGateFormula = Form("%s;%s",loa->At(1)->GetName(),loa->At(2)->GetName()); fDiamantTimeGateFormula = Form("%s;%s",loa->At(1)->GetName(),loa->At(2)->GetName());
delete loa; delete loa;
cout<<"DiamantTimeGate (min;max) = ("<<fDiamantTimeGateFormula<<")"<<endl; cout<<"\e[1;92mDiamantTimeGate (min;max) = ("<<fDiamantTimeGateFormula<<")\e[0m"<<endl;
} }
if(Buffer.BeginsWith("StatMin")) if(Buffer.BeginsWith("StatMin"))
{ {
TObjArray *loa=Buffer.Tokenize(" "); TObjArray *loa=Buffer.Tokenize(" ");
fStatMin = ((TString)loa->At(1)->GetName()).Atoi(); fStatMin = ((TString)loa->At(1)->GetName()).Atoi();
delete loa; delete loa;
cout<<"minimal statistics to save spectra = "<<fStatMin<< " events"<<endl; cout<<"\e[1;92mminimal statistics to save spectra = "<<fStatMin<< " events\e[0m"<<endl;
}
if(Buffer.BeginsWith("LighMode"))
{
fLightMode = true;
cout<<"\e[1;92mLight mode used, minimal number of histograms will be stored\e[0m"<<endl;
} }
} }
......
...@@ -73,6 +73,7 @@ TString fListOfZToPlot; ...@@ -73,6 +73,7 @@ TString fListOfZToPlot;
TString fNedaTimeGateFormula = ""; TString fNedaTimeGateFormula = "";
TString fDiamantTimeGateFormula = ""; TString fDiamantTimeGateFormula = "";
Bool_t fLightMode = false;
Int_t fStatMin=-1; Int_t fStatMin=-1;
Bool_t fUseProof; Bool_t fUseProof;
......
...@@ -102,6 +102,7 @@ void PlotResultsSelector::Begin(TTree * /*tree*/) ...@@ -102,6 +102,7 @@ void PlotResultsSelector::Begin(TTree * /*tree*/)
delete arr; delete arr;
fStatMin = gEnv->GetValue("StatMin", dummyint); fStatMin = gEnv->GetValue("StatMin", dummyint);
fLightMode = (Bool_t) gEnv->GetValue("LightMode", dummyint);
if(!fDiamantLookUpTable.BeginsWith("/") && fDiamantLookUpTable.Length()) if(!fDiamantLookUpTable.BeginsWith("/") && fDiamantLookUpTable.Length())
fDiamantLookUpTable.Prepend(Form("%s/",fWorkingDir.Data())); fDiamantLookUpTable.Prepend(Form("%s/",fWorkingDir.Data()));
...@@ -175,6 +176,7 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/) ...@@ -175,6 +176,7 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/)
delete arr; delete arr;
fStatMin = ((Int_t)((TParameter<Int_t>*)fInput->FindObject("StatMin"))->GetVal()); fStatMin = ((Int_t)((TParameter<Int_t>*)fInput->FindObject("StatMin"))->GetVal());
fLightMode = ((Int_t)((TParameter<Int_t>*)fInput->FindObject("LightMode"))->GetVal());
if(!fDiamantLookUpTable.BeginsWith("/") && fDiamantLookUpTable.Length()) if(!fDiamantLookUpTable.BeginsWith("/") && fDiamantLookUpTable.Length())
fDiamantLookUpTable.Prepend(Form("%s/",fWorkingDir.Data())); fDiamantLookUpTable.Prepend(Form("%s/",fWorkingDir.Data()));
...@@ -299,66 +301,70 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/) ...@@ -299,66 +301,70 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/)
Neda_Id_h = BuildHist1D("Neda_Id",Id_NEDA,fNedaHistList); Neda_Id_h = BuildHist1D("Neda_Id",Id_NEDA,fNedaHistList);
Neda_Mult_h = BuildHist1D("Neda_Mult",NEDA_mult,fNedaHistList); Neda_Mult_h = BuildHist1D("Neda_Mult",NEDA_mult,fNedaHistList);
NEDANNeutrons_h = BuildHist1D("Neda_NNeutrons",NEDA_NNeutrons,fNedaHistList); NEDANNeutrons_h = BuildHist1D("Neda_NNeutrons",NEDA_NNeutrons,fNedaHistList);
TList *l = new TList;l->SetName("Tdc");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++) Neda_BoardvsChannel_h = BuildHist2D("Neda_BoardvsChannel",Board_NEDA,Channel,fNedaHistList);
{
TString hist_name = Form("NEDATdc%02i",i); TList *l = nullptr;
NEDATdc_h[i] = BuildHist1D(hist_name,NEDA_Tdc,l);
} if(fLightMode==false)
l = new TList;l->SetName("Slow");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDASlow%02i",i);
NEDASlow_h[i] = BuildHist1D(hist_name,Slow,l);
}
l = new TList;l->SetName("Fast");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDAFast%02i",i);
NEDAFast_h[i] = BuildHist1D(hist_name,Fast,l);
}
l = new TList;l->SetName("Energy");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDAEnergy%02i",i);
NEDAEnergy_h[i] = BuildHist1D(hist_name,Energy,l);
}
l = new TList;l->SetName("Zco");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDAZco%02i",i);
NEDAZco_h[i] = BuildHist1D(hist_name,NEDA_Zco,l);
}
l = new TList;l->SetName("Cc");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDACc%02i",i);
NEDACc_h[i] = BuildHist1D(hist_name,Slow_over_Fast,l);
}
l = new TList;l->SetName("ToF");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDAToF%02i",i);
NEDAToF_h[i] = BuildHist1D(hist_name,ToF,l);
}
l = new TList;l->SetName("DeltaTSTime");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{ {
TString hist_name = Form("NEDADeltaTSTime%02i",i); l = new TList;l->SetName("Tdc");fNedaHistList->Add(l);
NEDADeltaTSTime_h[i] = BuildHist1D(hist_name,NEDA_DeltaTSTime,l); for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDATdc%02i",i);
NEDATdc_h[i] = BuildHist1D(hist_name,NEDA_Tdc,l);
}
l = new TList;l->SetName("Slow");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDASlow%02i",i);
NEDASlow_h[i] = BuildHist1D(hist_name,Slow,l);
}
l = new TList;l->SetName("Fast");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDAFast%02i",i);
NEDAFast_h[i] = BuildHist1D(hist_name,Fast,l);
}
l = new TList;l->SetName("Energy");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDAEnergy%02i",i);
NEDAEnergy_h[i] = BuildHist1D(hist_name,Energy,l);
}
l = new TList;l->SetName("Zco");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDAZco%02i",i);
NEDAZco_h[i] = BuildHist1D(hist_name,NEDA_Zco,l);
}
l = new TList;l->SetName("Cc");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDACc%02i",i);
NEDACc_h[i] = BuildHist1D(hist_name,Slow_over_Fast,l);
}
l = new TList;l->SetName("ToF");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDAToF%02i",i);
NEDAToF_h[i] = BuildHist1D(hist_name,ToF,l);
}
} }
///TH2 ///TH2
///
Neda_BoardvsChannel_h = BuildHist2D("Neda_BoardvsChannel",Board_NEDA,Channel,fNedaHistList); if(fLightMode==false)
NEDACcTof_tot_h = BuildHist2D("NEDACcTof_tot",Slow_over_Fast,ToF,fNedaHistList);
l = new TList;l->SetName("CcTof");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{ {
TString hist_name = Form("NEDACcTof%02i",i); NEDACcTof_tot_h = BuildHist2D("NEDACcTof_tot",Slow_over_Fast,ToF,fNedaHistList);
NEDACcTof_h[i] = BuildHist2D(hist_name,Slow_over_Fast,ToF,l);
l = new TList;l->SetName("CcTof");fNedaHistList->Add(l);
for (Int_t i=0; i<MaxNEDA; i++)
{
TString hist_name = Form("NEDACcTof%02i",i);
NEDACcTof_h[i] = BuildHist2D(hist_name,Slow_over_Fast,ToF,l);
}
} }
NEDAEnergyCc_tot_h = BuildHist2D("NEDAEnergyCc_tot",Energy,Slow_over_Fast,fNedaHistList); NEDAEnergyCc_tot_h = BuildHist2D("NEDAEnergyCc_tot",Energy,Slow_over_Fast,fNedaHistList);
...@@ -388,36 +394,30 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/) ...@@ -388,36 +394,30 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/)
DiamantEnergyPIDtot_h = BuildHist2D("DiamantEnergyPIDtot",Diamant_Energy,Diamant_PID,fDiamantHistList); DiamantEnergyPIDtot_h = BuildHist2D("DiamantEnergyPIDtot",Diamant_Energy,Diamant_PID,fDiamantHistList);
l = new TList;l->SetName("Energy");fDiamantHistList->Add(l); if(fLightMode==false)
for (Int_t i=0; i<MaxDIAMANT; i++)
{
TString hist_name = Form("DiamantEnergy%02i",i);
DiamantEnergy_h[i] = BuildHist1D(hist_name,Diamant_Energy,l);
}
l = new TList;l->SetName("Top");fDiamantHistList->Add(l);
for (Int_t i=0; i<MaxDIAMANT; i++)
{ {
TString hist_name = Form("DiamantTop%02i",i); l = new TList;l->SetName("Energy");fDiamantHistList->Add(l);
DiamantTop_h[i] = BuildHist1D(hist_name,Diamant_Top,l); for (Int_t i=0; i<MaxDIAMANT; i++)
} {
TString hist_name = Form("DiamantEnergy%02i",i);
DiamantEnergy_h[i] = BuildHist1D(hist_name,Diamant_Energy,l);
}
l = new TList;l->SetName("PID");fDiamantHistList->Add(l); l = new TList;l->SetName("Top");fDiamantHistList->Add(l);
for (Int_t i=0; i<MaxDIAMANT; i++) for (Int_t i=0; i<MaxDIAMANT; i++)
{ {
TString hist_name = Form("DiamantPID%02i",i); TString hist_name = Form("DiamantTop%02i",i);
DiamantPID_h[i] = BuildHist1D(hist_name,Diamant_PID,l); DiamantTop_h[i] = BuildHist1D(hist_name,Diamant_Top,l);
} }
l = new TList;l->SetName("DeltaTSTime");fDiamantHistList->Add(l); l = new TList;l->SetName("PID");fDiamantHistList->Add(l);
for (Int_t i=0; i<MaxDIAMANT; i++) for (Int_t i=0; i<MaxDIAMANT; i++)
{ {
TString hist_name = Form("DiamantDeltaTSTime%02i",i); TString hist_name = Form("DiamantPID%02i",i);
DiamantDeltaTSTime_h[i] = BuildHist1D(hist_name,Diamant_DeltaTSTime,l); DiamantPID_h[i] = BuildHist1D(hist_name,Diamant_PID,l);
}
} }
// TH2F // TH2F
l = new TList;l->SetName("EnergyPID");fDiamantHistList->Add(l); l = new TList;l->SetName("EnergyPID");fDiamantHistList->Add(l);
...@@ -436,27 +436,32 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/) ...@@ -436,27 +436,32 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/)
AGATA_Mult_h = BuildHist1D("AGATAMult",AGATA_mult,fAgataHistList); AGATA_Mult_h = BuildHist1D("AGATAMult",AGATA_mult,fAgataHistList);
AGATA_HitMult_h = BuildHist1D("AGATAHitMult",AGATA_Hitmult,fAgataHistList); AGATA_HitMult_h = BuildHist1D("AGATAHitMult",AGATA_Hitmult,fAgataHistList);
AGATA_CoreMult_h = BuildHist1D("AGATACoreMult",AGATA_Coremult,fAgataHistList); AGATA_CoreMult_h = BuildHist1D("AGATACoreMult",AGATA_Coremult,fAgataHistList);
AGATA_TrackE_h = BuildHist1D("TrackE",EGamma2,fAgataHistList);
l = new TList;l->SetName("TrackEvsNn");fAgataHistList->Add(l); if(fLightMode==false)
for (Int_t i=0; i<NMax_Neutrons_pdx; i++)
{ {
TString hist_name = Form("TrackE_n%i",i);
AGATA_TrackEvsNn_h[i] = BuildHist1D(hist_name,EGamma2,l);
}
l = new TList;l->SetName("TrackEvsAlpha");fAgataHistList->Add(l); AGATA_TrackE_h = BuildHist1D("TrackE",EGamma2,fAgataHistList);
for (Int_t i=0; i<NMax_Alphas_pdx; i++)
{
TString hist_name = Form("TrackE_alpha%i",i);
AGATA_TrackEvsAlpha_h[i] = BuildHist1D(hist_name,EGamma2,l);
}
l = new TList;l->SetName("TrackEvsProton");fAgataHistList->Add(l);// max 7 protons l = new TList;l->SetName("TrackEvsNn");fAgataHistList->Add(l);
for (Int_t i=0; i<NMax_Protons_pdx; i++) for (Int_t i=0; i<NMax_Neutrons_pdx; i++)
{ {
TString hist_name = Form("TrackE_proton%i",i); TString hist_name = Form("TrackE_n%i",i);
AGATA_TrackEvsProton_h[i] = BuildHist1D(hist_name,EGamma2,l); AGATA_TrackEvsNn_h[i] = BuildHist1D(hist_name,EGamma2,l);
}
l = new TList;l->SetName("TrackEvsAlpha");fAgataHistList->Add(l);
for (Int_t i=0; i<NMax_Alphas_pdx; i++)
{
TString hist_name = Form("TrackE_alpha%i",i);
AGATA_TrackEvsAlpha_h[i] = BuildHist1D(hist_name,EGamma2,l);
}
l = new TList;l->SetName("TrackEvsProton");fAgataHistList->Add(l);// max 7 protons
for (Int_t i=0; i<NMax_Protons_pdx; i++)
{
TString hist_name = Form("TrackE_proton%i",i);
AGATA_TrackEvsProton_h[i] = BuildHist1D(hist_name,EGamma2,l);
}
} }
/// ******************************** /// /// ******************************** ///
...@@ -747,18 +752,21 @@ void PlotResultsSelector::FillHistos() ...@@ -747,18 +752,21 @@ void PlotResultsSelector::FillHistos()
Int_t id = Neda_Id[i]; Int_t id = Neda_Id[i];
Neda_Id_h->Fill(id); Neda_Id_h->Fill(id);
NEDATdc_h[id]->Fill(Neda_Tdc[i]);
NEDASlow_h[id]->Fill(Neda_Slow[i]);
NEDAFast_h[id]->Fill(Neda_Fast[i]);
NEDAEnergy_h[id]->Fill(NEDAEnergy[i]);
NEDAZco_h[id]->Fill(Neda_Zco[i]);
NEDACc_h[id]->Fill(NEDACc[i]);
NEDAToF_h[id]->Fill(NEDATof[i]);
NEDADeltaTSTime_h[id]->Fill(NEDA_DeltaTSTime[i]);
Neda_BoardvsChannel_h->Fill(Neda_BoardId[i],Neda_ChannelId[i]); Neda_BoardvsChannel_h->Fill(Neda_BoardId[i],Neda_ChannelId[i]);
NEDACcTof_tot_h->Fill(NEDACc[i],NEDATof[i]);
NEDACcTof_h[id]->Fill(NEDACc[i],NEDATof[i]); if(fLightMode == false)
{
NEDATdc_h[id]->Fill(Neda_Tdc[i]);
NEDASlow_h[id]->Fill(Neda_Slow[i]);
NEDAFast_h[id]->Fill(Neda_Fast[i]);
NEDAEnergy_h[id]->Fill(NEDAEnergy[i]);
NEDAZco_h[id]->Fill(Neda_Zco[i]);
NEDACc_h[id]->Fill(NEDACc[i]);
NEDAToF_h[id]->Fill(NEDATof[i]);
NEDACcTof_tot_h->Fill(NEDACc[i],NEDATof[i]);
NEDACcTof_h[id]->Fill(NEDACc[i],NEDATof[i]);
}
if (id<54) if (id<54)
NEDAEnergyCc_tot_h->Fill(NEDAEnergy[i],NEDACc[i]); //NWall excluded NEDAEnergyCc_tot_h->Fill(NEDAEnergy[i],NEDACc[i]); //NWall excluded
...@@ -784,12 +792,15 @@ void PlotResultsSelector::FillHistos() ...@@ -784,12 +792,15 @@ void PlotResultsSelector::FillHistos()
Diamant_Id_h->Fill(id); Diamant_Id_h->Fill(id);
Diamant_BoardvsChannel_h->Fill(Diamant_BoardId[i],Diamant_ChannelId[i]); Diamant_BoardvsChannel_h->Fill(Diamant_BoardId[i],Diamant_ChannelId[i]);
DiamantEnergy_h[id]->Fill(Diamant_Energy[i]);
DiamantTop_h[id]->Fill(Diamant_Top[i]); if(fLightMode == false)
DiamantPID_h[id]->Fill(Diamant_PID[i]); {
DiamantEnergy_h[id]->Fill(Diamant_Energy[i]);
DiamantTop_h[id]->Fill(Diamant_Top[i]);
DiamantPID_h[id]->Fill(Diamant_PID[i]);
}
DiamantEnergyPID_h[id]->Fill(Diamant_Energy[i], Diamant_PID[i]); DiamantEnergyPID_h[id]->Fill(Diamant_Energy[i], Diamant_PID[i]);
DiamantEnergyPIDtot_h->Fill(Diamant_Energy[i], Diamant_PID[i]); DiamantEnergyPIDtot_h->Fill(Diamant_Energy[i], Diamant_PID[i]);
DiamantDeltaTSTime_h[id]->Fill(Diamant_DeltaTSTime[i]);
} }
/// Fill AGATA /// Fill AGATA
...@@ -800,28 +811,25 @@ void PlotResultsSelector::FillHistos() ...@@ -800,28 +811,25 @@ void PlotResultsSelector::FillHistos()
AGATA_HitMult_h->Fill(nbHits); AGATA_HitMult_h->Fill(nbHits);
AGATA_CoreMult_h->Fill(nbCores); AGATA_CoreMult_h->Fill(nbCores);
Long64_t Agata_time;
for( int ig1 = 0; ig1 < nbTrack; ig1++ ) if(fLightMode == false)
{ {
Agata_time = trackT[ig1] - trackT[0]; for( int ig1 = 0; ig1 < nbTrack; ig1++ )
if( Agata_time > Agata_max_DeltaTS || Agata_time < Agata_min_DeltaTS)
continue;
if( trackE[ig1] > 0 )
{ {
AGATA_TrackE_h->Fill( trackE[ig1] ); if( trackE[ig1] > 0 )
{
AGATA_TrackE_h->Fill( trackE[ig1] );
int in = NEDA_NNeutrons; if (in>(NMax_Neutrons_pdx-1)) in = NMax_Neutrons_pdx-1; int in = NEDA_NNeutrons; if (in>(NMax_Neutrons_pdx-1)) in = NMax_Neutrons_pdx-1;
int ia = DIAMANT_NAlphas; if (ia>(NMax_Alphas_pdx-1)) ia = NMax_Alphas_pdx-1; int ia = DIAMANT_NAlphas; if (ia>(NMax_Alphas_pdx-1)) ia = NMax_Alphas_pdx-1;
int ip = DIAMANT_NProtons; if (ip>(NMax_Protons_pdx-1)) ip = NMax_Protons_pdx-1; int ip = DIAMANT_NProtons; if (ip>(NMax_Protons_pdx-1)) ip = NMax_Protons_pdx-1;