Commit 64b3ff1d authored by Agata Analysis's avatar Agata Analysis
Browse files

Changed NEDA and DIAMANT times, now they are calculated with respect to TSHit

Corrected TSHit declaration  - it is not an array in the input tree
parent 0cf87aa8
......@@ -160,7 +160,7 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/)
Binning NEDA_Tdc(1000,-0.5,70000-0.5,"Neda Tdc");
Binning Energy(1000,-0.5,70000-0.5,"Neda Energy");
Binning NEDA_Zco(3,-0.5,2.5,"Neda Zco");
Binning NEDA_DeltaTSTime(2000, -1000.5,1000-0.5,"Neda Delta TS Time");
Binning NEDA_DeltaTSTime(2000, -300.5,300-0.5,"Neda Delta TS Time");
Binning Slow(1000,0,70000,"Slow");
Binning Fast(1000,0,70000,"Fast");
......@@ -179,7 +179,7 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/)
Binning Diamant_Top(1000,0,70000,"Diamant Top");
Binning Diamant_PID(512,0,1,"Diamant PID");
Binning Diamant_Energy(512,0,16000,"Diamant Energy");
Binning Diamant_DeltaTSTime(2000, -1000.5,1000-0.5,"Diamant Delta TS Time");
Binning Diamant_DeltaTSTime(2000, -300.5,300-0.5,"Diamant Delta TS Time");
/// AGATA Binnings
......@@ -436,7 +436,8 @@ void PlotResultsSelector::SlaveBegin(TTree * /*tree*/)
for (int j=0; j<=MaxAGATA;j++){
coreId[j] = 0; TSHit[j]=0;
// coreId[j] = 0; TSHit[j]=0;
coreId[j] = 0; TSHit = 0;
}
}
......@@ -998,7 +999,7 @@ Bool_t PlotResultsSelector::Process(Long64_t entry)
//Zeroing
for (int j=0; j<=nbCores-1;j++){//may nbCores-1
coreId[j] = -1;TSHit[j]=0;
coreId[j] = -1;TSHit =0;
}
return true;
......@@ -1022,7 +1023,8 @@ void PlotResultsSelector::Diamant_Identification()
id = Diamant_Id[i];
if (Diamant_TSHit[i]!=0) { //do not try to shift times which are not present
Int_t time0 = Diamant_deltaTSPeakPos[id]+0.5; //nearest integer
diamantTime = static_cast<ULong64_t>(trackT[0]) - Diamant_TSHit[i] + TStrack - time0;
// diamantTime = static_cast<ULong64_t>(trackT[0]) - Diamant_TSHit[i] + TStrack - time0;
diamantTime = TSHit - Diamant_TSHit[i] - static_cast<ULong64_t>(time0);
}
else {
diamantTime = 0;
......@@ -1105,7 +1107,9 @@ void PlotResultsSelector::Neda_Identification()
id = Neda_Id[i];
if (Neda_TSHit[i] != 0) { //do not try to shift times which are not present
Int_t time0 = NEDA_DeltaTSPeakPos[id]+0.5; //nearest integer
nedaTime = static_cast<ULong64_t>(trackT[0]) - Neda_TSHit[i] + TStrack - time0;
// nedaTime = static_cast<ULong64_t>(trackT[0]) - Neda_TSHit[i] + TStrack - time0;
nedaTime = TSHit - Neda_TSHit[i] - static_cast<ULong64_t>(time0);
}
else {
nedaTime = 0;
......
......@@ -196,7 +196,8 @@ public :
Float_t trackT[MaxAGATA];
Int_t trackCrystalID[MaxAGATA];
ULong64_t TSHit[MaxAGATA];
// ULong64_t TSHit[MaxAGATA]; // TSHit in the tree is not an array
ULong64_t TSHit; // TSHit in the tree is not an array
ULong64_t coreTS[MaxAGATA];
ULong64_t TStrack;
......@@ -330,7 +331,7 @@ public :
TBranch *b_hitSg; //!
TBranch *b_nbCores; //!
TBranch *b_coreId; //!
TBranch *b_coreE0; //!
TBranch *b_coreE0; //!g
TBranch *b_coreE1; //!
TBranch *b_coreT0; //!
TBranch *b_coreT1; //!
......
Markdown is supported
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