From ac035370b46fc7efd6a1c02859ff822b949490ff Mon Sep 17 00:00:00 2001 From: vsitaraman Date: Sun, 25 Jan 2026 14:15:45 -0500 Subject: [PATCH] modified: QQQ_Calcheck.C made changes to bring it in line with the new consistent Wedge-Ring mapping modified: TrackRecon.C --- QQQ_Calcheck.C | 6 +++--- TrackRecon.C | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/QQQ_Calcheck.C b/QQQ_Calcheck.C index 4d20ec2..0875db4 100644 --- a/QQQ_Calcheck.C +++ b/QQQ_Calcheck.C @@ -133,10 +133,10 @@ Bool_t QQQ_Calcheck::Process(Long64_t entry) else continue; // plug in calibrations - if (qqqCalibValid[qqq.id[i]][chRing][chWedge]) + if (qqqCalibValid[qqq.id[i]][chWedge][chRing]) { - eWedgeMeV = eWedge * qqqCalib[qqq.id[i]][chRing][chWedge] / 1000; - eRingMeV = eRing * qqqCalib[qqq.id[i]][chRing][chWedge] / 1000; + eWedgeMeV = eWedge * qqqCalib[qqq.id[i]][chWedge][chRing] / 1000; + eRingMeV = eRing * qqqCalib[qqq.id[i]][chWedge][chRing] / 1000; } else continue; diff --git a/TrackRecon.C b/TrackRecon.C index f1b6738..9d908d4 100644 --- a/TrackRecon.C +++ b/TrackRecon.C @@ -146,8 +146,8 @@ void TrackRecon::Begin(TTree * /*tree*/) double gainw, gainr; while (infile >> det >> wedge >> ring >> gainw >> gainr) { - qqqGain[det][ring][wedge] = gainw; - qqqGainValid[det][ring][wedge] = (gainw > 0); + qqqGain[det][wedge][ring] = gainw; + qqqGainValid[det][wedge][ring] = (gainw > 0); // std::cout << "QQQ Gain Loaded: Det " << det << " Ring " << ring << " Wedge " << wedge << " GainW " << gainw << " GainR " << gainr << std::endl; } infile.close(); @@ -162,8 +162,8 @@ void TrackRecon::Begin(TTree * /*tree*/) double slope; while (infile >> det >> wedge >> ring >> slope) { - qqqCalib[det][ring][wedge] = slope; - qqqCalibValid[det][ring][wedge] = (slope > 0); + qqqCalib[det][wedge][ring] = slope; + qqqCalibValid[det][wedge][ring] = (slope > 0); // std::cout << "QQQ Calib Loaded: Det " << det << " Ring " << ring << " Wedge " << wedge << " Slope " << slope << std::endl; } infile.close(); @@ -278,14 +278,14 @@ Bool_t TrackRecon::Process(Long64_t entry) else continue; - plotter->Fill1D("Wedgetime_Vs_Ringtime", 200, -1000, 1000, tWedge - tRing, "hCalQQQ"); + plotter->Fill1D("Wedgetime_Vs_Ringtime", 100, -1000, 1000, tWedge - tRing, "hCalQQQ"); plotter->Fill2D("RingE_vs_Index", 16 * 4, 0, 16 * 4, 1000, 0, 16000, chRing + qqq.id[i] * 16, eRing, "hRawQQQ"); plotter->Fill2D("WedgeE_vs_Index", 16 * 4, 0, 16 * 4, 1000, 0, 16000, chWedge + qqq.id[i] * 16, eWedge, "hRawQQQ"); - if (qqqCalibValid[qqq.id[i]][chRing][chWedge]) + if (qqqCalibValid[qqq.id[i]][chWedge][chRing]) { - eWedgeMeV = eWedge * qqqCalib[qqq.id[i]][chRing][chWedge] / 1000; - eRingMeV = eRing * qqqCalib[qqq.id[i]][chRing][chWedge] / 1000; + eWedgeMeV = eWedge * qqqCalib[qqq.id[i]][chWedge][chRing] / 1000; + eRingMeV = eRing * qqqCalib[qqq.id[i]][chWedge][chRing] / 1000; } else continue; @@ -317,6 +317,8 @@ Bool_t TrackRecon::Process(Long64_t entry) // // } plotter->Fill2D("Timing_Difference_QQQ_PC", 500, -1000, 1000, 16, 0, 16, tRing - static_cast(pc.t[k]), chRing, "hCalQQQ"); plotter->Fill2D("DelT_Vs_QQQRingECal", 500, -1000, 1000, 1000, 0, 10, tRing - static_cast(pc.t[k]), eRingMeV, "hCalQQQ"); + plotter->Fill2D("CalibratedQQQEvsPCE", 1000, 0, 10, 2000, 0, 30000, eRingMeV, pc.e[k], "hGMPC"); + plotter->Fill2D("CalibratedQQQEvsPCE", 1000, 0, 10, 2000, 0, 30000, eWedgeMeV, pc.e[k], "hGMPC"); if (tRing - static_cast(pc.t[k]) < -150 && tRing - static_cast(pc.t[k]) > -450) // 27Al // if (tRing - static_cast(pc.t[k]) < -70 && tRing - static_cast(pc.t[k]) > -150) // 17F { @@ -326,6 +328,7 @@ Bool_t TrackRecon::Process(Long64_t entry) if (pc.index[k] >= 24 && pc.e[k] > 50) { plotter->Fill2D("Timing_Difference_QQQ_PC_Cathode", 500, -1000, 1000, 16, 0, 16, tRing - static_cast(pc.t[k]), chRing, "hCalQQQ"); + } }