diff --git a/onlineGUI/Config/kpp.cfg b/onlineGUI/Config/kpp.cfg index 95640d03880bed9d9d2c730c23a78544e37ec304..3ba6650a5a7559572616275b4d67227aac2b1327 100755 --- a/onlineGUI/Config/kpp.cfg +++ b/onlineGUI/Config/kpp.cfg @@ -13,18 +13,6 @@ macro Macros/kpp_analysis.C("h_p2T_tdc") macro Macros/kpp_analysis.C("h_pT1_tdc") macro Macros/kpp_analysis.C("h_pT2_tdc") macro Macros/kpp_analysis.C("h_pT3_tdc") -#newpage 4 3 -#title DC Reference Times -#macro Macros/kpp_analysis.C("h_pDCREF1_tdc") -#macro Macros/kpp_analysis.C("h_pDCREF2_tdc") -#macro Macros/kpp_analysis.C("h_pDCREF3_tdc") -#macro Macros/kpp_analysis.C("h_pDCREF4_tdc") -#macro Macros/kpp_analysis.C("h_pDCREF5_tdc") -#macro Macros/kpp_analysis.C("h_pDCREF6_tdc") -#macro Macros/kpp_analysis.C("h_pDCREF7_tdc") -#macro Macros/kpp_analysis.C("h_pDCREF8_tdc") -#macro Macros/kpp_analysis.C("h_pDCREF9_tdc") -#macro Macros/kpp_analysis.C("h_pDCREF10_tdc") newpage 4 3 title Hodoscope Plane Reference Times macro Macros/kpp_analysis.C("h_p1XmpT2_tdc") @@ -121,10 +109,11 @@ macro Macros/kpp_analysis.C("h_ppshwr_sum") macro Macros/kpp_analysis.C("h_pshwr_sum") macro Macros/kpp_analysis.C("h_ptotshwr_sum") newpage 2 2 logz -title 2D Detector ADC Sums +title SHMS Particle Identification macro Macros/kpp_analysis.C("h2_pshwr_vs_phgcer") macro Macros/kpp_analysis.C("h2_pshwr_vs_pngcer") macro Macros/kpp_analysis.C("h2_pshwr_vs_ppshwr") +macro Macros/kpp_analysis.C("h2_EdivP_vs_P") diff --git a/onlineGUI/Macros/kpp_analysis.C b/onlineGUI/Macros/kpp_analysis.C index 57e4c5d097511a08a645271dd697212cf8f01481..ed68b4ee0cf0e3e066f0f7e6979270b2037efdbf 100644 --- a/onlineGUI/Macros/kpp_analysis.C +++ b/onlineGUI/Macros/kpp_analysis.C @@ -101,6 +101,9 @@ void UserScript() { Int_t pngc_hits; Double_t pngc_pmt[maxAdcHits*nngc_pmts], pngc_pulseTime[maxAdcHits*nngc_pmts]; Double_t pngc_pulseInt[maxAdcHits*nngc_pmts]; + + // Tracking information + Double_t trk_pmag; Long64_t nentries; @@ -148,6 +151,8 @@ void UserScript() { TH2F *h2_pshwr_vs_phgcer, *h2_pshwr_vs_pngcer, *h2_pshwr_vs_ppshwr; TH1F *h_paero_sum, *h_ppshwr_sum, *h_pshwr_sum, *h_ptotshwr_sum, *h_phgc_sum, *h_pngc_sum; + TH2F *h2_EdivP_vs_P; + // =:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=: // Declare trees @@ -298,6 +303,10 @@ void UserScript() { T->SetBranchAddress("P.ngcer.adcCounter", &pngc_pmt); T->SetBranchAddress("P.ngcer.adcPulseTimeRaw", &pngc_pulseTime); T->SetBranchAddress("P.ngcer.adcPulseInt", &pngc_pulseInt); + + // ==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==// + + T->SetBranchAddress("P.tr.p", &trk_pmag); // =:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=: @@ -414,6 +423,10 @@ void UserScript() { h_ptotshwr_sum = new TH1F ("h_ptotshwr_sum", "SHMS Total Shower Energy; Total Shower Energy; Counts / 10 MeV", 1200, 0, 12); h_phgc_sum = new TH1F ("h_phgc_sum", "SHMS Number of HGC Photoelectrons; Number of HGC Photoelectrons; Counts / 1 Photoelectron", 500, 0, 500); h_pngc_sum = new TH1F ("h_pngc_sum", "SHMS Number of NGC Photoelectrons; Number of NGC Photoelectrons; Counts / 1 Photoelectron", 500, 0, 500); + + // ==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==// + + h2_EdivP_vs_P = new TH2F ("h2_EdivP_vs_P", "SHMS E/p vs. p; p (geV); E/p", 600, 0, 6, 100, 0, 1); // =:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=: @@ -598,7 +611,10 @@ void UserScript() { } if (pshwr_sum != 0.0) h_pshwr_sum->Fill(pshwr_sum); if ((ppshwr_sum + pshwr_sum) != 0.0) h_ptotshwr_sum->Fill(ppshwr_sum + pshwr_sum); - if (ppshwr_sum != 0.0 && pshwr_sum != 0.0) h2_pshwr_vs_ppshwr->Fill(ppshwr_sum, pshwr_sum); + if (ppshwr_sum != 0.0 && pshwr_sum != 0.0) { + h2_pshwr_vs_ppshwr->Fill(ppshwr_sum, pshwr_sum); + if (trk_pmag != 0.0) h2_EdivP_vs_P->Fill(trk_pmag, (ppshwr_sum + pshwr_sum)/trk_pmag); + } // ==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==//==