diff --git a/.gitignore b/.gitignore
index ae7c1868a4b1d69f57db48e6783928a483cb962e..96a060c70b17d82cd03fb6d412596919d120a124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,25 @@
+# File extensions
*~
-*.sw?
-ROOTfiles
-ROOTfiles/*
-ROOTfiles.old/*
-bck/*
-#*
-*#*
-hcana
-raw
-cache
-.root_history
-HISTOGRAMS/*
-REPORT_OUTPUT
-REPORT_OUTPUT/*
-log/*
-onlineGUI/Config/kpp_*
+*#*#*
*.d
*.so
-*Auto*
-CALIBRATION/shms_cal_calib/pcal.param*
-CALIBRATION/hms_cal_calib/hcal.param*
-CALIBRATION/shms_cal_calib/calibrated.deb
-CALIBRATION/hms_cal_calib/calibrated.deb
-CALIBRATION/hms_cal_calib/hcal_calib_cpp_ACLiC_dict_rdict.pcm
-CALIBRATION/shms_cal_calib/pcal_calib_cpp_ACLiC_dict_rdict.pcm
-CALIBRATION/*/data_files/*
-CALIBRATION/*/root_files/*
-CALIBRATION/shms_dc_calib/data_files/
-onlineGUI/onlineGUI_v1.2.1/onlineDict_rdict.pcm
+*.pcm
+*.png
+*.ps
+*.eps
+*.pdf
.nfs*
-raw.copiedtotape
+*.root
+
+# Directories
+REPORT_OUTPUT
HISTOGRAMS
-*.png
-*.ps
\ No newline at end of file
+MON_OUTPUT
+ROOTfiles
+.root_history
+raw
+raw.copiedtotape
+cache
+
+# Symbolic links
+hcana
\ No newline at end of file
diff --git a/CALIBRATION/shms_aero_calib/gain.r b/CALIBRATION/shms_aero_calib/gain.r
new file mode 100644
index 0000000000000000000000000000000000000000..d141b2a82d3ea5148d51bb0be8ede40fbd852e02
--- /dev/null
+++ b/CALIBRATION/shms_aero_calib/gain.r
@@ -0,0 +1,2 @@
+paero_neg_gain = 1./13.0732, 1./11.1519, 1./12.7171, 1./11.7946, 1./10.7654, 1./8.72566, 1./12.9509,
+paero_pos_gain = 1./7.45058, 1./10.1029, 1./10.7762, 1./13.0162, 1./10.5675, 1./10.9487, 1./10.8312,
diff --git a/CALIBRATION/shms_aero_calib/gain_4985.r b/CALIBRATION/shms_aero_calib/gain_4985.r
new file mode 100644
index 0000000000000000000000000000000000000000..7656b21c6e58f6dda5dd56ac02361de97080ce70
--- /dev/null
+++ b/CALIBRATION/shms_aero_calib/gain_4985.r
@@ -0,0 +1,2 @@
+paero_neg_gain = 1./13.5843, 1./11.1229, 1./12.5078, 1./11.5904, 1./11.019, 1./8.54602, 1./12.5383,
+paero_pos_gain = 1./7.3637, 1./9.83655, 1./10.4292, 1./12.8879, 1./10.45, 1./10.5741, 1./10.6287,
diff --git a/CALIBRATION/shms_aero_calib/paero_calib.C b/CALIBRATION/shms_aero_calib/paero_calib.C
index 106bc26abb8bfa1524f98ed93a7d68b873c8e2db..3ddcc4be25e15a3d72e78446dab87d577814d302 100644
--- a/CALIBRATION/shms_aero_calib/paero_calib.C
+++ b/CALIBRATION/shms_aero_calib/paero_calib.C
@@ -21,7 +21,18 @@
#define MaxAdc 40. //pC
#define NBin 1000
-void paero_calib(string fname) {
+void paero_calib(string rootname = "") {
+
+ if (rootname=="") {
+ cout << "Please enter root file name...\n";
+ cin >> rootname;
+ }
+
+ string fname = "../../ROOTfiles/" + rootname + ".root";
+ TString outputpdf;
+ outputpdf = "OUTPUT/" + rootname + ".pdf";
+ TString outputpng;
+ outputpng = "OUTPUT/" + rootname + ".png";
TFile *f = new TFile(fname.c_str());
TTree* tree;
@@ -55,17 +66,22 @@ void paero_calib(string fname) {
hpos[i]->Fill(adc_pos[i], 1.);
hneg[i]->Fill(adc_neg[i], 1.);
}
+
+ cout << "Entry " << ientry << "/" << nentries << '\n';
}
TCanvas* c1 = new TCanvas("adc_spec", "fADC spectra", 600, 800);
c1->Divide(2,NPMT);
- double flo_neg[NPMT] { 8., 8.,10., 8., 7., 5., 8.};
- double fhi_neg[NPMT] {16.,13.,18.,14.,15.,10.,18.};
- double flo_pos[NPMT] { 5., 6., 8.,10., 5., 6., 5.};
- double fhi_pos[NPMT] {10.,12.,14.,17.,10.,12.,11.};
+ //ADC {-1, -2, -3, -4, -5, -6, -7}
+ double flo_neg[NPMT] { 9., 7.,8., 8., 6., 5., 8.};
+ double fhi_neg[NPMT] {17.,14.,18.,15.,15.,12.,16.};
+
+ //ADC {+1, +2, +3, +4, +5, +6, +7}
+ double flo_pos[NPMT] { 5., 6., 7.,9., 6., 7., 7.};
+ double fhi_pos[NPMT] {9.,14.,14.,17.,14.,14.,14.};
float gain_pos[NPMT] {NPMT*0.};
float gain_neg[NPMT] {NPMT*0.};
@@ -77,7 +93,7 @@ void paero_calib(string fname) {
hpos[i]->Fit("gaus","","",flo_pos[i],fhi_pos[i]);
hpos[i]->GetFunction("gaus")->SetLineColor(2);
hpos[i]->GetFunction("gaus")->SetLineWidth(2);
- gain_pos[i] = hpos[i]->GetFunction("gaus")->GetParameter(1);
+ gain_pos[i] = hpos[i]->GetFunction("gaus")->GetParameter(1);
}
else
hpos[i]->Draw();
@@ -86,11 +102,14 @@ void paero_calib(string fname) {
hneg[i]->Fit("gaus","","",flo_neg[i],fhi_neg[i]);
hneg[i]->GetFunction("gaus")->SetLineColor(2);
hneg[i]->GetFunction("gaus")->SetLineWidth(2);
- gain_neg[i] = hneg[i]->GetFunction("gaus")->GetParameter(1);
+ gain_neg[i] = hneg[i]->GetFunction("gaus")->GetParameter(1);
}
else
hneg[i]->Draw();
}
+
+ c1->Print(outputpdf);
+ c1->Print(outputpng);
ofstream of;
of.open("gain.r",ios::out);
diff --git a/CALIBRATION/shms_cal_calib/THcPShowerCalib.h b/CALIBRATION/shms_cal_calib/THcPShowerCalib.h
index f895ad0af333dcc70d32f8e335c15b80e58581a2..48c1eb39879cc6295bdc24f602d7f784561bf905 100644
--- a/CALIBRATION/shms_cal_calib/THcPShowerCalib.h
+++ b/CALIBRATION/shms_cal_calib/THcPShowerCalib.h
@@ -538,11 +538,11 @@ bool THcPShowerCalib::ReadShRawTrack(THcPShTrack &trk, UInt_t ientry) {
good_trk = P_tr_xp > -0.045+0.0025*P_tr_x;
if (!good_trk) return 0;
- bool good_ngcer = P_ngcer_npe[0] > fNGCerMin ||
- P_ngcer_npe[1] > fNGCerMin ||
- P_ngcer_npe[2] > fNGCerMin ||
- P_ngcer_npe[3] > fNGCerMin ;
- if(!good_ngcer) return 0;
+ // bool good_ngcer = P_ngcer_npe[0] > fNGCerMin ||
+ // P_ngcer_npe[1] > fNGCerMin ||
+ // P_ngcer_npe[2] > fNGCerMin ||
+ // P_ngcer_npe[3] > fNGCerMin ;
+ // if(!good_ngcer) return 0;
bool good_hgcer = P_hgcer_npe[0] +
P_hgcer_npe[1] +
diff --git a/CALIBRATION/shms_hgcer_calib/calibration.C b/CALIBRATION/shms_hgcer_calib/calibration.C
index 438a8fe7af2d35b0196ca12caeabfaa78dbecdaa..97b41635232c24b2a7cc47f7fe879c4b075e893f 100644
--- a/CALIBRATION/shms_hgcer_calib/calibration.C
+++ b/CALIBRATION/shms_hgcer_calib/calibration.C
@@ -176,7 +176,7 @@ Bool_t calibration::Process(Long64_t entry)
{
//Require loose cut on particle velocity
fBeta_Full->Fill(P_tr_beta[itrack]);
- if (TMath::Abs(P_tr_beta[itrack] - 1.0) > 0.5) return kTRUE;
+ if (TMath::Abs(P_tr_beta[itrack] - 1.0) > 0.2) return kTRUE;
fBeta_Cut->Fill(P_tr_beta[itrack]);
//Filling the histograms
@@ -184,7 +184,7 @@ Bool_t calibration::Process(Long64_t entry)
{
//Perform a loose timing cut
fTiming_Full->Fill(P_hgcer_goodAdcTdcDiffTime[ipmt]);
- if (P_hgcer_goodAdcTdcDiffTime[ipmt] > 20.0 || P_hgcer_goodAdcTdcDiffTime[ipmt] < -20.0) continue;
+ if (P_hgcer_goodAdcTdcDiffTime[ipmt] > 13.0 || P_hgcer_goodAdcTdcDiffTime[ipmt] < 7.0) continue;
fTiming_Cut->Fill(P_hgcer_goodAdcTdcDiffTime[ipmt]);
//Cuts to remove entries corresponding to a PMT not registering a hit
@@ -487,6 +487,10 @@ void calibration::Terminate()
TF1 *Gauss1 = new TF1("Gauss1",gauss,-10,200,3);
Gauss1->SetParNames("Amplitude","Mean","Std. Dev.");
+ //Sum of two Gaussians to determine SPE with minimal systematics
+ TF1 *Gauss2 = new TF1("Gauss2",gauss,2,10,6);
+ Gauss2->SetParNames("Amplitude 1","Mean 1","Std. Dev. 1","Amplitude 2","Mean 2","Std. Dev. 2");
+
//Sum of three Gaussians to determine NPE spacing
TF1 *Gauss3 = new TF1("Gauss3",gauss,0.5,3.5,9);
Gauss3->SetParNames("Amplitude 1","Mean 1","Std. Dev. 1","Amplitude 2","Mean 2","Std. Dev. 2","Amplitude 3","Mean 3","Std. Dev. 3");
@@ -552,17 +556,23 @@ void calibration::Terminate()
if (xpeaks[1] < xpeaks[0]) xpeaks[1] = xpeaks[0];
//Use the peak to fit the SPE with a Gaussian to determine the mean
- Gauss1->SetRange(xpeaks[0]-3, xpeaks[0]+3);
- Gauss1->SetParameter(1, xpeaks[0]);
- Gauss1->SetParameter(2, 10.);
- Gauss1->SetParLimits(0, 0., 2000.);
- Gauss1->SetParLimits(1, xpeaks[0]-3, xpeaks[0]+3);
- Gauss1->SetParLimits(2, 0.5, 10.);
- fFullShow ? PulseInt_quad[iquad][ipmt]->Fit("Gauss1","RQ") : PulseInt_quad[iquad][ipmt]->Fit("Gauss1","RQN");
+ Gauss2->SetRange(xpeaks[0]-3, xpeaks[0]+10);
+ Gauss2->SetParameter(1, xpeaks[0]);
+ Gauss2->SetParameter(2, 10.);
+ Gauss2->SetParameter(1, xpeaks[1]);
+ Gauss2->SetParameter(2, 10.);
+ Gauss2->SetParLimits(0, 0., 2000.);
+ Gauss2->SetParLimits(1, xpeaks[0]-3, xpeaks[0]+3);
+ Gauss2->SetParLimits(2, 0.5, 10.);
+ Gauss2->SetParLimits(3, 0., 2000.);
+ Gauss2->SetParLimits(4, xpeaks[1]-3, xpeaks[1]+3);
+ Gauss2->SetParLimits(5, 0.5, 10.);
+ fFullShow ? PulseInt_quad[iquad][ipmt]->Fit("Gauss2","RQ") : PulseInt_quad[iquad][ipmt]->Fit("Gauss2","RQN");
//if (fFullShow) PulseInt_quad[iquad][ipmt]->GetXaxis()->SetRangeUser(0,20);
//Store the mean of the SPE in the mean array provided it is not zero and passes a loose statistical cut. Note that indexing by ipad-1 is for convienience
- if (xpeaks[0] > 2.0 && PulseInt_quad[iquad][ipmt]->GetBinContent(PulseInt_quad[iquad][ipmt]->GetXaxis()->FindBin(xpeaks[1])) > 90) mean[ipad-1] = Gauss1->GetParameter(1);
+ cout << xpeaks[0] << " " << PulseInt_quad[iquad][ipmt]->GetBinContent(PulseInt_quad[iquad][ipmt]->GetXaxis()->FindBin(xpeaks[0])) << endl;
+ if (xpeaks[0] > 2.0 && PulseInt_quad[iquad][ipmt]->GetBinContent(PulseInt_quad[iquad][ipmt]->GetXaxis()->FindBin(xpeaks[0])) > 90) mean[ipad-1] = Gauss2->GetParameter(1);
ipad++;
}
}
diff --git a/DBASE/COIN/standard.kinematics b/DBASE/COIN/standard.kinematics
index a279e35add9e49809f86f38b318a6c3b4714995a..060337211ebf604f0b9f14ea495e2145f08708fd 100644
--- a/DBASE/COIN/standard.kinematics
+++ b/DBASE/COIN/standard.kinematics
@@ -3,8 +3,8 @@
# Need to set ptheta_lab to a POSITIVE value
# 1H gtargmass_amu = 1.00794
# 12C gtargmass_amu = 12.0107
-# 27Al gtargmass_amu = 26.98
-#
+# 27Al gtargmass_amu = 26.98 (Dummy target should be analyzed as 1H, since it is the background underneath)
+# ppartmass = 0.493677 for K+ physics production runs
0-1710
gpbeam = 6.430
@@ -4414,7 +4414,7 @@ ppcentral = 2.65*0.985
ppartmass = 0.1395706
hpartmass = 0.0005109
-4336 - 9999
+4336
gpbeam = 10.600
gtargmass_amu =1.00794
htheta_lab = -19.705
@@ -4423,3 +4423,628 @@ hpcentral = 3.32
ppcentral = 2.65*0.985
ppartmass = 0.1395706
hpartmass = 0.0005109
+
+
+4698 - 4715
+gpbeam = 10.600
+gtargmass_amu =1.00794
+htheta_lab = -13.5
+ptheta_lab = 18.00
+hpcentral = 5.27
+ppcentral = 2.53
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+
+4716 - 4718
+gpbeam = 10.600
+gtargmass_amu =1.00794
+htheta_lab = -24.43
+ptheta_lab = 20.53
+hpcentral = 4.
+ppcentral = 2.
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+
+4719-4721
+gpbeam = 10.600
+gtargmass_amu =1.00794
+htheta_lab = -24.43
+ptheta_lab = 20.53
+hpcentral = 3.
+ppcentral = 2.
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+# Optics running
+
+4735 - 4736
+gpbeam = 10.600
+gtargmass_amu = 12.0107
+htheta_lab = -13.01
+ptheta_lab = 9.505
+hpcentral = 6.6
+ppcentral = 8.035
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4737 - 4779
+gpbeam = 10.600
+gtargmass_amu = 12.0107
+htheta_lab = -13.01
+ptheta_lab = 9.505
+hpcentral = 6.6+6.6*0.0145
+ppcentral = 8.035
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+# Heep single
+
+4780 - 4784
+gpbeam = 10.588
+gtargmass_amu = 12.0107
+htheta_lab = -22.60
+ptheta_lab = 20.00
+hpcentral = 5.322
+ppcentral = 6.30
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4785
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -22.60
+ptheta_lab = 20.00
+hpcentral = 5.322
+ppcentral = 6.30
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+#Golden Sieve Run 4686
+
+4786
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -22.60
+ptheta_lab = 20.00
+hpcentral = 5.322
+ppcentral = 6.30
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+#Beam pos check
+
+4787
+gpbeam = 10.588
+gtargmass_amu = 12.0107
+htheta_lab = -13.01
+ptheta_lab = 9.505
+hpcentral = 5.322
+ppcentral = 6.30
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+#Heep single
+
+4788 - 4790
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -24.17
+ptheta_lab = 18.00
+hpcentral = 5.322
+ppcentral = 6.842
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4791 - 4792
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -24.17
+ptheta_lab = 16.25
+hpcentral = 5.322
+ppcentral = 6.842
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4793 - 4794
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -24.17
+ptheta_lab = 19.85
+hpcentral = 5.322
+ppcentral = 6.842
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4795 - 4799
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -24.17
+ptheta_lab = 13.80
+hpcentral = 5.322
+ppcentral = 6.842
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4800 - 4801
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -24.17
+ptheta_lab = 13.80
+hpcentral = 5.322
+ppcentral = 6.842
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4802 - 4804
+gpbeam = 10.588
+gtargmass_amu = 12.0107
+htheta_lab = -24.17
+ptheta_lab = 13.80
+hpcentral = 5.322
+ppcentral = 6.842
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4805 - 4813
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -18.80
+ptheta_lab = 13.70
+hpcentral = 6.590
+ppcentral = 8.035
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+
+4814 - 4817
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -17.20
+ptheta_lab = 11.70
+hpcentral = 6.590
+ppcentral = 8.035
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4818 - 4820
+gpbeam = 10.588
+gtargmass_amu = 12.0107
+htheta_lab = -13.005
+ptheta_lab = 11.70
+hpcentral = 6.590
+ppcentral = 8.035
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4821 - 4825
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -19.755
+ptheta_lab = 15.650
+hpcentral = 6.590
+ppcentral = 8.035
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4826
+gpbeam = 10.588
+gtargmass_amu = 12.0107
+htheta_lab = -13.00
+ptheta_lab = 15.650
+hpcentral = 6.590
+ppcentral = 8.035
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4827 - 4864
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -18.845
+ptheta_lab = 26.147
+hpcentral = 6.590
+ppcentral = 4.840
+ppartmass = 0.0005109
+hpartmass = 0.0005109
+
+4865-4870
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -11.91
+ptheta_lab = 15.18
+hpcentral = 6.590
+ppcentral = 3.486
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+4871-4880
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -11.91
+ptheta_lab = 18.18
+hpcentral = 6.590
+ppcentral = 3.486
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+4881 - 4890
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -11.91
+ptheta_lab = 21.180
+hpcentral = 6.590
+ppcentral = 3.486
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+4891
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -11.159
+ptheta_lab = 7.738
+hpcentral = 5.292
+ppcentral = 4.983
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+
+4892 - 4912
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -11.159
+ptheta_lab = 13.742
+hpcentral = 5.292
+ppcentral = 4.983
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+4913 - 4924
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -11.159
+ptheta_lab = 10.735
+hpcentral = 5.292
+ppcentral = 4.983
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+4925-4939
+gpbeam = 10.588
+gtargmass_amu = 1.00794
+htheta_lab = -11.159
+ptheta_lab = 7.735
+hpcentral = 5.292
+ppcentral = 4.983
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+4940-4944
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -11.159
+ptheta_lab = 7.735
+hpcentral = 5.292
+ppcentral = 4.983
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+4945-4947
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -11.159
+ptheta_lab = 10.730
+hpcentral = 5.292
+ppcentral = 4.983
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+4948-4959
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -11.159
+ptheta_lab = 7.73
+hpcentral = 5.292
+ppcentral = 4.983
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+4960-4979
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -17.08
+ptheta_lab = 9.81
+hpcentral = 4.712
+ppcentral = 5.389
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+4980-4998
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -17.08
+ptheta_lab = 12.81
+hpcentral = 4.712
+ppcentral = 5.389
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+
+
+4999-5012
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -17.08
+ptheta_lab = 15.81
+hpcentral = 4.712
+ppcentral = 5.389
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+
+
+5013-5039
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -14.93
+ptheta_lab = 12.46
+hpcentral = 4.204
+ppcentral = 6.053
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5040-5077
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -14.93
+ptheta_lab = 9.42
+hpcentral = 4.204
+ppcentral = 6.053
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5078-5123
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -14.93
+ptheta_lab = 6.495
+hpcentral = 4.204
+ppcentral = 6.053
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5124-5145
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.005
+ptheta_lab = 6.490
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+
+5149-5153
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -12.53
+ptheta_lab = 6.495
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5154-5158
+gpbeam = 10.585
+gtargmass_amu = 12.0107
+htheta_lab = -12.53
+ptheta_lab = 6.495
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+
+5159-5166
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -12.53
+ptheta_lab = 6.495
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+
+
+5167-5173
+gpbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -14.93
+ptheta_lab = 6.495
+hpcentral = 4.204
+ppcentral = 6.053
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5174-5181
+gpbeam = 10.585
+gtargmass_amu = 12.0107
+htheta_lab = -14.93
+ptheta_lab = 6.495
+hpcentral = 4.204
+ppcentral = 6.053
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5182-5220
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.00
+ptheta_lab = 6.495
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5221-5233
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.00
+ptheta_lab = 9.552
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+
+5234-5235
+pbeam = 10.585
+gtargmass_amu = 12.0107
+htheta_lab = -23.00
+ptheta_lab = 9.552
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5236-5248
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.00
+ptheta_lab = 12.565
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5249-5250
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.00
+ptheta_lab = 12.565
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5251-5261
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.00
+ptheta_lab = 9.555
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5262-5263
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.00
+ptheta_lab = 12.555
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5264-5264
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.00
+ptheta_lab = 6.509
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5265-5270
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.00
+ptheta_lab = 9.560
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5271-5274
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.00
+ptheta_lab = 12.565
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5275-5294
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -23.00
+ptheta_lab = 6.500
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5295-5299
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -12.505
+ptheta_lab = 6.500
+hpcentral = 3.266
+ppcentral = 6.842
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5300-5303
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -14.91
+ptheta_lab = 6.500
+hpcentral = 4.204
+ppcentral = 6.053
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5304-5310
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -14.91
+ptheta_lab = 9.425
+hpcentral = 4.204
+ppcentral = 6.053
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+
+5311-5312
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -14.91
+ptheta_lab = 12.42
+hpcentral = 4.204
+ppcentral = 6.053
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5313-5334
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -14.91
+ptheta_lab = 6.525
+hpcentral = 4.204
+ppcentral = 6.053
+ppartmass = 0.493677
+hpartmass = 0.0005109
+
+5335-9999
+pbeam = 10.585
+gtargmass_amu = 1.00794
+htheta_lab = -13.50
+ptheta_lab = 13.50
+hpcentral = 6.269
+ppcentral = 6.269
+ppartmass = 0.0005109
+hpartmass = 0.0005109
diff --git a/DBASE/HMS/standard.kinematics b/DBASE/HMS/standard.kinematics
index 578ddbb61aa1e9f47317d650c409e91cab301664..9e42fedaca66e99038594dd4fbafaf7b0ebc31b1 100644
--- a/DBASE/HMS/standard.kinematics
+++ b/DBASE/HMS/standard.kinematics
@@ -1648,9 +1648,17 @@ htheta_lab = -15.01
hpcentral = 5.1
-2109-9999
+2109
gpbeam = 10.59
gtargmass_amu = 1.00794
hpartmass = 0.00051099
htheta_lab = -13.505
hpcentral = 5.27
+
+
+4697
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -13.505
+hpcentral = 5.27
\ No newline at end of file
diff --git a/DBASE/SHMS/standard.kinematics b/DBASE/SHMS/standard.kinematics
index 68657525f1a4bcba818f3f3a2853a2eb3591fc14..9a14436448f0daa64a951d07d2b8b0d3c086c2eb 100644
--- a/DBASE/SHMS/standard.kinematics
+++ b/DBASE/SHMS/standard.kinematics
@@ -7,7 +7,7 @@
# 1722 is last December commissioning run
-0-1722
+0-9999
gpbeam = 2.221
gtargmass_amu=12.0107
ppartmass = 0.00051099
diff --git a/DEF-files/COIN/PRODUCTION/CUTS/coin_decode_cuts.def b/DEF-files/COIN/PRODUCTION/CUTS/coin_decode_cuts.def
index 2498367a03966a8bfe1c72c17a372559e29f6df9..4963a4e9791a510e9f1ff7f541e45f3162f629a7 100644
--- a/DEF-files/COIN/PRODUCTION/CUTS/coin_decode_cuts.def
+++ b/DEF-files/COIN/PRODUCTION/CUTS/coin_decode_cuts.def
@@ -1,32 +1,32 @@
Block: Decode
-pTRIG1_ROC2 T.coin.pTRIG1_ROC2_tdcTimeRaw > 0
-pTRIG2_ROC2 T.coin.pTRIG2_ROC2_tdcTimeRaw > 0
-pTRIG3_ROC2 T.coin.pTRIG3_ROC2_tdcTimeRaw > 0
-pTRIG4_ROC2 T.coin.pTRIG4_ROC2_tdcTimeRaw > 0
-pTRIG5_ROC2 T.coin.pTRIG5_ROC2_tdcTimeRaw > 0
-pTRIG6_ROC2 T.coin.pTRIG6_ROC2_tdcTimeRaw > 0
-
-pTRIG1_ROC1 T.coin.pTRIG1_ROC1_tdcTimeRaw > 0
-pTRIG2_ROC1 T.coin.pTRIG2_ROC1_tdcTimeRaw > 0
-pTRIG3_ROC1 T.coin.pTRIG3_ROC1_tdcTimeRaw > 0
-pTRIG4_ROC1 T.coin.pTRIG4_ROC1_tdcTimeRaw > 0
-pTRIG5_ROC1 T.coin.pTRIG5_ROC1_tdcTimeRaw > 0
-pTRIG6_ROC1 T.coin.pTRIG6_ROC1_tdcTimeRaw > 0
-
-hTRIG1_ROC2 T.coin.hTRIG1_ROC2_tdcTimeRaw > 0
-hTRIG2_ROC2 T.coin.hTRIG2_ROC2_tdcTimeRaw > 0
-hTRIG3_ROC2 T.coin.hTRIG3_ROC2_tdcTimeRaw > 0
-hTRIG4_ROC2 T.coin.hTRIG4_ROC2_tdcTimeRaw > 0
-hTRIG5_ROC2 T.coin.hTRIG5_ROC2_tdcTimeRaw > 0
-hTRIG6_ROC2 T.coin.hTRIG6_ROC2_tdcTimeRaw > 0
-
-hTRIG1_ROC1 T.coin.hTRIG1_ROC1_tdcTimeRaw > 0
-hTRIG2_ROC1 T.coin.hTRIG2_ROC1_tdcTimeRaw > 0
-hTRIG3_ROC1 T.coin.hTRIG3_ROC1_tdcTimeRaw > 0
-hTRIG4_ROC1 T.coin.hTRIG4_ROC1_tdcTimeRaw > 0
-hTRIG5_ROC1 T.coin.hTRIG5_ROC1_tdcTimeRaw > 0
-hTRIG6_ROC1 T.coin.hTRIG6_ROC1_tdcTimeRaw > 0
+pTRIG1_ROC2 T.coin.pTRIG1_ROC2_tdcTime > -10000.0 && T.coin.pTRIG1_ROC2_tdcTime < 10000.0
+pTRIG2_ROC2 T.coin.pTRIG2_ROC2_tdcTime > -10000.0 && T.coin.pTRIG2_ROC2_tdcTime < 10000.0
+pTRIG3_ROC2 T.coin.pTRIG3_ROC2_tdcTime > -10000.0 && T.coin.pTRIG3_ROC2_tdcTime < 10000.0
+pTRIG4_ROC2 T.coin.pTRIG4_ROC2_tdcTime > -10000.0 && T.coin.pTRIG4_ROC2_tdcTime < 10000.0
+pTRIG5_ROC2 T.coin.pTRIG5_ROC2_tdcTime > -10000.0 && T.coin.pTRIG5_ROC2_tdcTime < 10000.0
+pTRIG6_ROC2 T.coin.pTRIG6_ROC2_tdcTime > -10000.0 && T.coin.pTRIG6_ROC2_tdcTime < 10000.0
+
+pTRIG1_ROC1 T.coin.pTRIG1_ROC1_tdcTime > -10000.0 && T.coin.pTRIG1_ROC1_tdcTime < 10000.0
+pTRIG2_ROC1 T.coin.pTRIG2_ROC1_tdcTime > -10000.0 && T.coin.pTRIG2_ROC1_tdcTime < 10000.0
+pTRIG3_ROC1 T.coin.pTRIG3_ROC1_tdcTime > -10000.0 && T.coin.pTRIG3_ROC1_tdcTime < 10000.0
+pTRIG4_ROC1 T.coin.pTRIG4_ROC1_tdcTime > -10000.0 && T.coin.pTRIG4_ROC1_tdcTime < 10000.0
+pTRIG5_ROC1 T.coin.pTRIG5_ROC1_tdcTime > -10000.0 && T.coin.pTRIG5_ROC1_tdcTime < 10000.0
+pTRIG6_ROC1 T.coin.pTRIG6_ROC1_tdcTime > -10000.0 && T.coin.pTRIG6_ROC1_tdcTime < 10000.0
+
+hTRIG1_ROC2 T.coin.hTRIG1_ROC2_tdcTime > -10000.0 && T.coin.hTRIG1_ROC2_tdcTime < 10000.0
+hTRIG2_ROC2 T.coin.hTRIG2_ROC2_tdcTime > -10000.0 && T.coin.hTRIG2_ROC2_tdcTime < 10000.0
+hTRIG3_ROC2 T.coin.hTRIG3_ROC2_tdcTime > -10000.0 && T.coin.hTRIG3_ROC2_tdcTime < 10000.0
+hTRIG4_ROC2 T.coin.hTRIG4_ROC2_tdcTime > -10000.0 && T.coin.hTRIG4_ROC2_tdcTime < 10000.0
+hTRIG5_ROC2 T.coin.hTRIG5_ROC2_tdcTime > -10000.0 && T.coin.hTRIG5_ROC2_tdcTime < 10000.0
+hTRIG6_ROC2 T.coin.hTRIG6_ROC2_tdcTime > -10000.0 && T.coin.hTRIG6_ROC2_tdcTime < 10000.0
+
+hTRIG1_ROC1 T.coin.hTRIG1_ROC1_tdcTime > -10000.0 && T.coin.hTRIG1_ROC1_tdcTime < 10000.0
+hTRIG2_ROC1 T.coin.hTRIG2_ROC1_tdcTime > -10000.0 && T.coin.hTRIG2_ROC1_tdcTime < 10000.0
+hTRIG3_ROC1 T.coin.hTRIG3_ROC1_tdcTime > -10000.0 && T.coin.hTRIG3_ROC1_tdcTime < 10000.0
+hTRIG4_ROC1 T.coin.hTRIG4_ROC1_tdcTime > -10000.0 && T.coin.hTRIG4_ROC1_tdcTime < 10000.0
+hTRIG5_ROC1 T.coin.hTRIG5_ROC1_tdcTime > -10000.0 && T.coin.hTRIG5_ROC1_tdcTime < 10000.0
+hTRIG6_ROC1 T.coin.hTRIG6_ROC1_tdcTime > -10000.0 && T.coin.hTRIG6_ROC1_tdcTime < 10000.0
shms_trigs SHMS_event
hms_trigs HMS_event
@@ -43,4 +43,5 @@ pcut_good_S1_time T.coin.p1T_tdcTime > 241 && T.coin.p1T_tdcTime < 243
pcut_good_S2X_time T.coin.p2X_tdcTime > 180 && T.coin.p2X_tdcTime < 220
pcut_good_S1_S2X_time pcut_good_S1_time && pcut_good_S2X_time
-ALL_COIN_NO_EDTM T.coin.hEDTM_tdcTime==0.0&&T.coin.pEDTM_tdcTime==0.0&&ALL_events
\ No newline at end of file
+ALL_COIN_events_NO_EDTM T.coin.hEDTM_tdcTime == 0.0 && T.coin.pEDTM_tdcTime == 0.0 && ALL_COIN_events
+ALL_events_NO_EDTM T.coin.hEDTM_tdcTime == 0.0 && T.coin.pEDTM_tdcTime == 0.0 && ALL_events
\ No newline at end of file
diff --git a/DEF-files/COIN/PRODUCTION/CUTS/coin_production_cuts.def b/DEF-files/COIN/PRODUCTION/CUTS/coin_production_cuts.def
index 8700332ad631d1744d9697f3e4dcb132781dfa37..795fc466c2d57dc9248f4d71363c6ec3b9231699 100644
--- a/DEF-files/COIN/PRODUCTION/CUTS/coin_production_cuts.def
+++ b/DEF-files/COIN/PRODUCTION/CUTS/coin_production_cuts.def
@@ -1,29 +1,29 @@
Block: RawDecode
#include "DEF-files/COIN/PRODUCTION/CUTS/coin_rawdecode_cuts.def"
-RawDecode_master ALL_events
+RawDecode_master ALL_events
Block: Decode
#include "DEF-files/COIN/PRODUCTION/CUTS/coin_decode_cuts.def"
-Decode_master ALL_COIN_NO_EDTM
+Decode_master ALL_events_NO_EDTM
Block: CoarseTracking
#include "DEF-files/SHMS/PRODUCTION/CUTS/pstackana_coarsetracking_cuts.def"
#include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_coarsetracking_cuts.def"
-CoarseTracking_master ALL_COIN_NO_EDTM
+CoarseTracking_master ALL_events_NO_EDTM
Block: CoarseReconstruct
-CoarseReconstruct_master ALL_COIN_NO_EDTM
+CoarseReconstruct_master ALL_events_NO_EDTM
Block: Tracking
-Tracking_master ALL_COIN_NO_EDTM
+Tracking_master ALL_events_NO_EDTM
Block: Reconstruct
#include "DEF-files/SHMS/PRODUCTION/CUTS/pstackana_reconstruct_cuts.def"
#include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_reconstruct_cuts.def"
#include "DEF-files/COIN/PRODUCTION/CUTS/coin_reconstruct_cuts.def"
-Reconstruct_master ALL_COIN_NO_EDTM
+Reconstruct_master ALL_events_NO_EDTM
Block: Physics
#include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_physics_cuts.def"
#include "DEF-files/SHMS/PRODUCTION/CUTS/pstackana_physics_cuts.def"
-Physics_master ALL_COIN_NO_EDTM
\ No newline at end of file
+Physics_master ALL_events_NO_EDTM
\ No newline at end of file
diff --git a/DEF-files/COIN/PRODUCTION/CUTS/coin_rawdecode_cuts.def b/DEF-files/COIN/PRODUCTION/CUTS/coin_rawdecode_cuts.def
index dc97f73fc03fb3c90d760a378badcc288b15503e..07a50ce7ca68888533787964ee77c28c1dcfa2a7 100644
--- a/DEF-files/COIN/PRODUCTION/CUTS/coin_rawdecode_cuts.def
+++ b/DEF-files/COIN/PRODUCTION/CUTS/coin_rawdecode_cuts.def
@@ -9,7 +9,7 @@ SHMS_COIN_event g.evtyp == 5
HMS_COIN_event g.evtyp == 6
COIN_ALL_event g.evtyp == 7
+ALL_events g.evtyp >= 1 && g.evtyp <= 7
+ALL_COIN_events g.evtyp >= 4 && g.evtyp <= 7
ALL_HMS_events HMS_event || COIN_ONLY_event || HMS_COIN_event || COIN_ALL_event
-ALL_SHMS_events SHMS_event || COIN_ONLY_event || SHMS_COIN_event || COIN_ALL_event
-ALL_events SHMS_event || HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event || SHMS_COIN_event || HMS_COIN_event
-ALL_COIN g.evtyp >= 4 &&g.evtyp <= 7
\ No newline at end of file
+ALL_SHMS_events SHMS_event || COIN_ONLY_event || SHMS_COIN_event || COIN_ALL_event
\ No newline at end of file
diff --git a/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def b/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def
index b29dcc37715550b705f1dcbed99fcd7e79563e06..6f13e43a105092c8bf2d0d0d38823148b7736c68 100644
--- a/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def
+++ b/DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def
@@ -13,11 +13,11 @@ TH1F hcal_hD_good_occ_pos 'HMS hD+ Good Occupancy; PMT Number; Number of Entries
# Good Multiplicity
TH1F hcal_hA_good_mult_pos 'HMS hA+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.1pr.totNumGoodPosAdcHits 13 0.5 13.5
TH1F hcal_hA_good_mult_neg 'HMS hA- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' H.cal.1pr.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hA_good_mult 'HMS hA Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.1pr.totnumGoodAdcHits 26 0.5 26.5
+# TH1F hcal_hA_good_mult 'HMS hA Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.1pr.totnumGoodAdcHits 26 0.5 26.5
TH1F hcal_hB_good_mult_pos 'HMS hB+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.2ta.totNumGoodPosAdcHits 13 0.5 13.5
TH1F hcal_hB_good_mult_neg 'HMS hB- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits / PMT' H.cal.2ta.totNumGoodNegAdcHits 13 0.5 13.5
-TH1F hcal_hB_good_mult 'HMS hB Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.2ta.totnumGoodAdcHits 26 0.5 26.5
+# TH1F hcal_hB_good_mult 'HMS hB Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits / PMT' H.cal.2ta.totnumGoodAdcHits 26 0.5 26.5
TH1F hcal_hC_good_mult_pos 'HMS hC+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.3ta.totNumGoodPosAdcHits 13 0.5 13.5
TH1F hcal_hD_good_mult_pos 'HMS hD+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits / PMT' H.cal.4ta.totNumGoodPosAdcHits 13 0.5 13.5
@@ -28,5 +28,4 @@ TH2F hcal_hA_good_pped_vs_pmt_neg 'HMS hA- Good Pulse Pedestal vs. PMT Number; P
TH2F hcal_hB_good_pped_vs_pmt_pos 'HMS hB+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 0.25 mV' [I+1] H.cal.2ta.goodPosAdcPed 13 0.5 13.5 200 100 150 H.cal.2ta.goodPosAdcPed>0.0
TH2F hcal_hB_good_pped_vs_pmt_neg 'HMS hB- Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 0.25 mV' [I+1] H.cal.2ta.goodNegAdcPed 13 0.5 13.5 200 100 150 H.cal.2ta.goodNegAdcPed>0.0
TH2F hcal_hC_good_pped_vs_pmt_pos 'HMS hC+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 0.25 mV' [I+1] H.cal.3ta.goodPosAdcPed 13 0.5 13.5 200 100 150 H.cal.3ta.goodPosAdcPed>0.0
-TH2F hcal_hD_good_pped_vs_pmt_pos 'HMS hD+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 0.25 mV' [I+1] H.cal.4ta.goodPosAdcPed 13 0.5 13.5 200 100 150 H.cal.4ta.goodPosAdcPed>0.0
-
+TH2F hcal_hD_good_pped_vs_pmt_pos 'HMS hD+ Good Pulse Pedestal vs. PMT Number; PMT Number; Good Pulse Pedestal / 0.25 mV' [I+1] H.cal.4ta.goodPosAdcPed 13 0.5 13.5 200 100 150 H.cal.4ta.goodPosAdcPed>0.0
\ No newline at end of file
diff --git a/DEF-files/HMS/PRODUCTION/CER/hcer_histos.def b/DEF-files/HMS/PRODUCTION/CER/hcer_histos.def
index d0a3fe988800f15693999148c130e4c9ba74a065..71eab87ea0c0642d8488e510fe4c14fbe765c154 100644
--- a/DEF-files/HMS/PRODUCTION/CER/hcer_histos.def
+++ b/DEF-files/HMS/PRODUCTION/CER/hcer_histos.def
@@ -13,22 +13,22 @@ TH1F hcer_good_mult 'HMS Cherenkov Good Multiplicity; Number of PMTs Hit; Total
TH2F hcer_npe 'HMS Cherenkov Number of Photoelectrons vs. PMT Number; PMT Number; Number of Photoelectrons / 0.5 Photoelectrons' [I+1] H.cer.npe 2 0.5 2.5 100 0 50 H.cer.npe>0.0
# HMS CER Total Number of P.E.
-TH1F hcer_tot_npe 'HMS Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' H.cer.npeSum 100 0 50 H.cer.npeSum>0.0
+# TH1F hcer_tot_npe 'HMS Cherenkov Total Number of Photoelectrons; Total Number of Photoelectrons; Number of Entries / 0.5 Photoelectrons' H.cer.npeSum 100 0 50 H.cer.npeSum>0.0
#--------------------------
# HMS CER TRACK MATCHING
#--------------------------
-TH1F hcer_trk_match 'HMS Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' H.cer.numTracksMatched 2 0.5 2.5
-TH1F hcer_trk_fired 'HMS Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' H.cer.numTracksFired 2 0.5 2.5
+# TH1F hcer_trk_match 'HMS Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' H.cer.numTracksMatched 2 0.5 2.5
+# TH1F hcer_trk_fired 'HMS Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' H.cer.numTracksFired 2 0.5 2.5
#--------------------------
# HMS CER TRACK PROJECTION
#--------------------------
-TH1F hcer_xtrack 'HMS Cherenkov Tracking X; X (cm); Number of Entries / 1 cm' H.cer.xAtCer 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
-TH1F hcer_ytrack 'HMS Cherenkov Tracking Y; Y (cm); Number of Entries / 1 cm' H.cer.yAtCer 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
-TH2F hcer_xytrack 'HMS Cherenkov Tracking Y vs X; Y (cm) / 1 cm; X (cm) / 1 cm' H.cer.yAtCer H.cer.xAtCer 120 -60 60 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
+# TH1F hcer_xtrack 'HMS Cherenkov Tracking X; X (cm); Number of Entries / 1 cm' H.cer.xAtCer 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
+# TH1F hcer_ytrack 'HMS Cherenkov Tracking Y; Y (cm); Number of Entries / 1 cm' H.cer.yAtCer 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
+TH2F hcer_xytrack 'HMS Cherenkov Tracking Y vs X; Y (cm) / 1 cm; X (cm) / 1 cm' H.cer.yAtCer H.cer.xAtCer 120 -60 60 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
TH2F hcer_x_vs_npe 'HMS Cherenkov X vs NPE; NPE / 0.5 PE ; X (cm) / 1 cm' H.cer.npeSum H.cer.xAtCer 100 0 50 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
TH2F hcer_y_vs_npe 'HMS Cherenkov Y vs NPE; NPE / 0.5 PE ; Y (cm) / 1 cm' H.cer.npeSum H.cer.yAtCer 100 0 50 120 -60 60 H.cer.xAtCer!=0.0&&H.cer.yAtCer!=0
diff --git a/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def b/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def
index 6a7b03c918e26cf78cb96cadbad8535f9c0af3be..4e488d5ea2c3857fdcf0ddd8eb271675f1ecee46 100644
--- a/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def
+++ b/DEF-files/HMS/PRODUCTION/DC/hdc_histos.def
@@ -1,24 +1,41 @@
#**********************
# HMS Drift Chambers *
#**********************
+#------------------
+# HMS DC Raw WIRE MAP
+#------------------
+
+TH1F hdc1u1_rawwirenum 'HMS DC 1U1 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.1u1.raw.wirenum 96 0.5 96.5
+TH1F hdc1u2_rawwirenum 'HMS DC 1U2 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.1u2.raw.wirenum 96 0.5 96.5
+TH1F hdc1x1_rawwirenum 'HMS DC 1X1 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.1x1.raw.wirenum 102 0.5 102.5
+TH1F hdc1x2_rawwirenum 'HMS DC 1X2 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.1x2.raw.wirenum 102 0.5 102.5
+TH1F hdc1v1_rawwirenum 'HMS DC 1V1 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.1v1.raw.wirenum 96 0.5 96.5
+TH1F hdc1v2_rawwirenum 'HMS DC 1V2 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.1v2.raw.wirenum 96 0.5 96.5
+
+TH1F hdc2v2_rawwirenum 'HMS DC 2V2 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.2v2.raw.wirenum 96 0.5 96.5
+TH1F hdc2v1_rawwirenum 'HMS DC 2V1 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.2v1.raw.wirenum 96 0.5 96.5
+TH1F hdc2x2_rawwirenum 'HMS DC 2X2 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.2x2.raw.wirenum 102 0.5 102.5
+TH1F hdc2x1_rawwirenum 'HMS DC 2X1 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.2x1.raw.wirenum 102 0.5 102.5
+TH1F hdc2u2_rawwirenum 'HMS DC 2U2 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.2u2.raw.wirenum 96 0.5 96.5
+TH1F hdc2u1_rawwirenum 'HMS DC 2U1 Raw Wiremap; Wire Number (all hits); Number of Entries' H.dc.2u1.raw.wirenum 96 0.5 96.5
#------------------
# HMS DC WIRE MAP
#------------------
-TH1F hdc1u1_wirenum 'HMS DC 1U1 Wiremap; Wire Number; Number of Entries' H.dc.1u1.wirenum 96 0.5 96.5
-TH1F hdc1u2_wirenum 'HMS DC 1U2 Wiremap; Wire Number; Number of Entries' H.dc.1u2.wirenum 96 0.5 96.5
-TH1F hdc1x1_wirenum 'HMS DC 1X1 Wiremap; Wire Number; Number of Entries' H.dc.1x1.wirenum 102 0.5 102.5
-TH1F hdc1x2_wirenum 'HMS DC 1X2 Wiremap; Wire Number; Number of Entries' H.dc.1x2.wirenum 102 0.5 102.5
-TH1F hdc1v1_wirenum 'HMS DC 1V1 Wiremap; Wire Number; Number of Entries' H.dc.1v1.wirenum 96 0.5 96.5
-TH1F hdc1v2_wirenum 'HMS DC 1V2 Wiremap; Wire Number; Number of Entries' H.dc.1v2.wirenum 96 0.5 96.5
+TH1F hdc1u1_wirenum 'HMS DC 1U1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.1u1.wirenum 96 0.5 96.5
+TH1F hdc1u2_wirenum 'HMS DC 1U2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.1u2.wirenum 96 0.5 96.5
+TH1F hdc1x1_wirenum 'HMS DC 1X1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.1x1.wirenum 102 0.5 102.5
+TH1F hdc1x2_wirenum 'HMS DC 1X2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.1x2.wirenum 102 0.5 102.5
+TH1F hdc1v1_wirenum 'HMS DC 1V1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.1v1.wirenum 96 0.5 96.5
+TH1F hdc1v2_wirenum 'HMS DC 1V2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.1v2.wirenum 96 0.5 96.5
-TH1F hdc2v2_wirenum 'HMS DC 2V2 Wiremap; Wire Number; Number of Entries' H.dc.2v2.wirenum 96 0.5 96.5
-TH1F hdc2v1_wirenum 'HMS DC 2V1 Wiremap; Wire Number; Number of Entries' H.dc.2v1.wirenum 96 0.5 96.5
-TH1F hdc2x2_wirenum 'HMS DC 2X2 Wiremap; Wire Number; Number of Entries' H.dc.2x2.wirenum 102 0.5 102.5
-TH1F hdc2x1_wirenum 'HMS DC 2X1 Wiremap; Wire Number; Number of Entries' H.dc.2x1.wirenum 102 0.5 102.5
-TH1F hdc2u2_wirenum 'HMS DC 2U2 Wiremap; Wire Number; Number of Entries' H.dc.2u2.wirenum 96 0.5 96.5
-TH1F hdc2u1_wirenum 'HMS DC 2U1 Wiremap; Wire Number; Number of Entries' H.dc.2u1.wirenum 96 0.5 96.5
+TH1F hdc2v2_wirenum 'HMS DC 2V2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.2v2.wirenum 96 0.5 96.5
+TH1F hdc2v1_wirenum 'HMS DC 2V1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.2v1.wirenum 96 0.5 96.5
+TH1F hdc2x2_wirenum 'HMS DC 2X2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.2x2.wirenum 102 0.5 102.5
+TH1F hdc2x1_wirenum 'HMS DC 2X1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.2x1.wirenum 102 0.5 102.5
+TH1F hdc2u2_wirenum 'HMS DC 2U2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.2u2.wirenum 96 0.5 96.5
+TH1F hdc2u1_wirenum 'HMS DC 2U1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' H.dc.2u1.wirenum 96 0.5 96.5
#------------------------------
# HMS DC DRIFT TIME PER PLANE
diff --git a/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def b/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def
index d0a021ad4b10903f4f6cc9bd8393c264e2b6bc05..e2f6d1f408b59e9104ae81aebe3bac1c038cbb36 100644
--- a/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def
+++ b/DEF-files/HMS/PRODUCTION/PID/hpid_histos.def
@@ -3,14 +3,14 @@
# TOTAL ENERGY AND NORMALIZED ENERGY DEPOSITED IN CALORIMETER (SHOWER AND PRE-SHOWER)
#-------------------------------------------------------------------------------------
-TH1F hcal_etrack 'HMS Calorimeter Total Track Energy; Track Energy Deposition (GeV); Number of Entries / 0.1 GeV' H.cal.etrack 100 0 10 H.cal.etrack>0.0
-TH1F hcal_etracknorm 'HMS Calorimeter Normalized Track Energy; Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' H.cal.etracknorm 100 0 10 H.cal.etracknorm>0.0
-TH1F hcal_etracknorm_track 'HMS Calorimeter Normalized Track Energy (Ntrack > 0); Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' H.cal.etracknorm 100 0 10 H.cal.etracknorm>0.0&&H.dc.ntrack>0
-TH1F hcal_etracknorm_track_elec 'HMS Cal E/p Elec (npeSum>.5 && abs(del)<8); E/p; Entries / 0.005' H.cal.etracknorm 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum>.5&&H.cer.npeSum>.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
-TH1F hcal_etracknorm_track_pion 'HMS Cal E/p Pion (npeSum<.5 && abs(del)<8); E/p; Entries / 0.005' H.cal.etracknorm 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum<.5&&H.cer.npeSum<.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
-TH1F hcal_etrack_track_elec 'HMS Cal Electron Energy (npeSum>.5 && abs(del)<8); etrack; Entries / 0.005' H.cal.etrack 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum>.5&&H.cer.npeSum>.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
-TH1F hcal_etrack_track_pion 'HMS Cal Pion Energy (npeSum<.5 && abs(del)<8); etrack; Entries / 0.005' H.cal.etrack 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum<.5&&H.cer.npeSum<.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
-TH2F hcal_etot_etrack 'HMS Cal energy vs. track energy; Track Energy Deposition (GeV) / 0.005 GeV; Total Energy (GeV) / 0.005 GeV' H.cal.etrack H.cal.etot 1000 0. 5. 1000 0. 5. H.dc.ntrack>0
+# TH1F hcal_etrack 'HMS Calorimeter Total Track Energy; Track Energy Deposition (GeV); Number of Entries / 0.1 GeV' H.cal.etrack 100 0 10 H.cal.etrack>0.0
+# TH1F hcal_etracknorm 'HMS Calorimeter Normalized Track Energy; Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' H.cal.etracknorm 100 0 10 H.cal.etracknorm>0.0
+# TH1F hcal_etracknorm_track 'HMS Calorimeter Normalized Track Energy (Ntrack > 0); Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.1 ' H.cal.etracknorm 100 0 10 H.cal.etracknorm>0.0&&H.dc.ntrack>0
+# TH1F hcal_etracknorm_track_elec 'HMS Cal E/p Elec (npeSum>.5 && abs(del)<8); E/p; Entries / 0.005' H.cal.etracknorm 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum>.5&&H.cer.npeSum>.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
+# TH1F hcal_etracknorm_track_pion 'HMS Cal E/p Pion (npeSum<.5 && abs(del)<8); E/p; Entries / 0.005' H.cal.etracknorm 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum<.5&&H.cer.npeSum<.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
+# TH1F hcal_etrack_track_elec 'HMS Cal Electron Energy (npeSum>.5 && abs(del)<8); etrack; Entries / 0.005' H.cal.etrack 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum>.5&&H.cer.npeSum>.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
+# TH1F hcal_etrack_track_pion 'HMS Cal Pion Energy (npeSum<.5 && abs(del)<8); etrack; Entries / 0.005' H.cal.etrack 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum<.5&&H.cer.npeSum<.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
+# TH2F hcal_etot_etrack 'HMS Cal energy vs. track energy; Track Energy Deposition (GeV) / 0.005 GeV; Total Energy (GeV) / 0.005 GeV' H.cal.etrack H.cal.etot 1000 0. 5. 1000 0. 5. H.dc.ntrack>0
TH2F hcal_npe_etracknorm 'HMS Cer Npe vs. Cal E/p; Normalized Track Energy Deposition / 0.005; cer NPE / 0.025 NPE' H.cal.etracknorm H.cer.npeSum 300 0. 1.5 60 0. 15. H.dc.ntrack>0
#-------------------------------
@@ -32,40 +32,40 @@ TH2F hcal_delta_etracknorm_pi 'HMS Delta vs. Cal E/p; Normalized Track Energy
# CLUSTERING PLOTS
#---------------------------
-TH1F hcal_xclusttrack 'HMS Cal Cluster X Pos; Cluster X (cm); Entries / 1 cm' H.cal.xclusttrack 200 -100. 100. H.cal.nclusttrack>-1
-TH1F hcal_xdiff 'HMS Cal Cluster X - Track X; Cluster X - Track X (cm); Entries / 0.2 cm' H.cal.xclusttrack-H.cal.xtrack 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
-TH2F hcal_xdiff_v_xtr 'HMS Cal (Cluster X- Track X) vs. (Track X); Track X (cm) / 0.2 cm; Cluster X - Track X (cm) / 0.2 cm' H.cal.xtrack H.cal.xclusttrack-H.cal.xtrack 1000 -100. 100. 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
-TH1F hcal_xtrack 'HMS Cal Track X; Track X (cm); Entries / 0.2 cm' H.cal.xtrack 1000 -100. 100. H.cal.nclusttrack>-1&&H.dc.ntrack>0
-TH1F hcal_xtrack1 'HMS Cal Track x pos with no matching clust; Track X (cm); Entries / 0.2 cm' H.cal.xtrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
-TH1F hcal_xtrack2 'HMS Cal Track x pos with no matching clust number of cluster=1; Track X (cm); Entries / 0.2 cm' H.cal.xtrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.cal.nclust==0&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
-TH1F hcal_yclusttrack 'HMS Cal Cluster y Pos; Cluster y (cm); Entries / 1 cm' H.cal.yclusttrack 200 -100. 100. H.cal.nclusttrack>-1
-TH1F hcal_ydiff 'HMS Cal Cluster y - Track y; Cluster y - Track y (cm); Entries / 0.2 cm' H.cal.yclusttrack-H.cal.ytrack 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
-TH2F hcal_ydiff_v_ytr 'HMS Cal (Cluster y - Track y) vs. (Track y); Track y (cm) / 0.2 cm; Cluster y - Track y (cm) / 0.2 cm' H.cal.ytrack H.cal.yclusttrack-H.cal.ytrack 1000 -100. 100. 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
-TH1F hcal_ytrack 'HMS Cal Track y; Track y (cm); Entries / 0.2 cm' H.cal.ytrack 1000 -100. 100. H.cal.nclusttrack>-1&&H.dc.ntrack>0
-TH1F hcal_ytrack1 'HMS Cal Track y pos with no matching clust; Track y (cm); Entries / 0.2 cm' H.cal.ytrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
-TH1F hcal_ytrack2 'HMS Cal Track y pos with no matching clust number of cluster=1; Track y (cm); Entries / 0.2 cm' H.cal.ytrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.cal.nclust==0&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
-TH2F hcal_xytrack 'HMS Cal Track X vs Track Y; Track Y / 1 cm; Track X / 1 cm' H.cal.ytrack H.cal.xtrack 200 -100 100 200 -100 100 H.dc.ntrack>0
-TH2F hcal_xyclusttrack 'HMS Cal Cluster X vs Cluster Y; Cluster Y / 1 cm; Cluster X / 1 cm' H.cal.yclusttrack H.cal.xclusttrack 200 -100 100 200 -100 100 H.cal.nclusttrack>-1&&H.dc.ntrack>0
-TH2F hcal_xtrack_vs_etrack 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hcut_CleanTrack
-TH2F hcal_ytrack_vs_etrack 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hcut_CleanTrack
+# TH1F hcal_xclusttrack 'HMS Cal Cluster X Pos; Cluster X (cm); Entries / 1 cm' H.cal.xclusttrack 200 -100. 100. H.cal.nclusttrack>-1
+# TH1F hcal_xdiff 'HMS Cal Cluster X - Track X; Cluster X - Track X (cm); Entries / 0.2 cm' H.cal.xclusttrack-H.cal.xtrack 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+# TH2F hcal_xdiff_v_xtr 'HMS Cal (Cluster X- Track X) vs. (Track X); Track X (cm) / 0.2 cm; Cluster X - Track X (cm) / 0.2 cm' H.cal.xtrack H.cal.xclusttrack-H.cal.xtrack 1000 -100. 100. 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+# TH1F hcal_xtrack 'HMS Cal Track X; Track X (cm); Entries / 0.2 cm' H.cal.xtrack 1000 -100. 100. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+# TH1F hcal_xtrack1 'HMS Cal Track x pos with no matching clust; Track X (cm); Entries / 0.2 cm' H.cal.xtrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
+# TH1F hcal_xtrack2 'HMS Cal Track x pos with no matching clust number of cluster=1; Track X (cm); Entries / 0.2 cm' H.cal.xtrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.cal.nclust==0&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
+# TH1F hcal_yclusttrack 'HMS Cal Cluster y Pos; Cluster y (cm); Entries / 1 cm' H.cal.yclusttrack 200 -100. 100. H.cal.nclusttrack>-1
+# TH1F hcal_ydiff 'HMS Cal Cluster y - Track y; Cluster y - Track y (cm); Entries / 0.2 cm' H.cal.yclusttrack-H.cal.ytrack 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+# TH2F hcal_ydiff_v_ytr 'HMS Cal (Cluster y - Track y) vs. (Track y); Track y (cm) / 0.2 cm; Cluster y - Track y (cm) / 0.2 cm' H.cal.ytrack H.cal.yclusttrack-H.cal.ytrack 1000 -100. 100. 200 -50. 50. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+# TH1F hcal_ytrack 'HMS Cal Track y; Track y (cm); Entries / 0.2 cm' H.cal.ytrack 1000 -100. 100. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+# TH1F hcal_ytrack1 'HMS Cal Track y pos with no matching clust; Track y (cm); Entries / 0.2 cm' H.cal.ytrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
+# TH1F hcal_ytrack2 'HMS Cal Track y pos with no matching clust number of cluster=1; Track y (cm); Entries / 0.2 cm' H.cal.ytrack 1000 -100. 100. H.cal.nclusttrack==-1&&H.cal.nclust==0&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
+# TH2F hcal_xytrack 'HMS Cal Track X vs Track Y; Track Y / 1 cm; Track X / 1 cm' H.cal.ytrack H.cal.xtrack 200 -100 100 200 -100 100 H.dc.ntrack>0
+# TH2F hcal_xyclusttrack 'HMS Cal Cluster X vs Cluster Y; Cluster Y / 1 cm; Cluster X / 1 cm' H.cal.yclusttrack H.cal.xclusttrack 200 -100 100 200 -100 100 H.cal.nclusttrack>-1&&H.dc.ntrack>0
+# TH2F hcal_xtrack_vs_etrack 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hcut_CleanTrack
+# TH2F hcal_ytrack_vs_etrack 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hcut_CleanTrack
TH2F hcal_xtrack_vs_etracknorm 'HMS Calorimeter xtrack vs Normalized Track Energy; Track Energy Deposition (Gev) / 0.01 GeV; X Track (cm) / 1 cm' H.cal.etracknorm H.cal.xtrack 150 0 1.5 130 -65 65 hcut_CleanTrack
TH2F hcal_ytrack_vs_etracknorm 'HMS Calorimeter ytrack vs Normalized Track Energy; Track Energy Deposition (Gev) / 0.01 GeV; Y Track (cm) / 1 cm' H.cal.etracknorm H.cal.ytrack 150 0 1.5 70 -35 35 hcut_CleanTrack
-TH2F hcal_xtrack_vs_etrack_elec 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_elec
-TH2F hcal_ytrack_vs_etrack_elec 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_elec
-TH2F hcal_xtrack_vs_etrack_pi 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_pi
-TH2F hcal_ytrack_vs_etrack_pi 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_pi
+# TH2F hcal_xtrack_vs_etrack_elec 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_elec
+# TH2F hcal_ytrack_vs_etrack_elec 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_elec
+# TH2F hcal_xtrack_vs_etrack_pi 'HMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' H.cal.etrack H.cal.xtrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_pi
+# TH2F hcal_ytrack_vs_etrack_pi 'HMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' H.cal.etrack H.cal.ytrack 100 0 10 200 -100 100 hcut_CleanTrack&&hcut_cer_pi
#**********************
# HMS Drift Chambers *
#**********************
-TH1F hdc_trk_beta_elec 'HMS DC ElectronTrack Beta; Beta; Number of Entires' H.tr.beta 300 -1.5 1.5 hcut_CleanTrack&&hcut_cer_elec
-TH1F hdc_trk_beta_pi 'HMS DC Pion Track Beta; Beta; Number of Entires' H.tr.beta 300 -1.5 1.5 hcut_CleanTrack&&hcut_cer_pi
+# TH1F hdc_trk_beta_elec 'HMS DC ElectronTrack Beta; Beta; Number of Entires' H.tr.beta 300 -1.5 1.5 hcut_CleanTrack&&hcut_cer_elec
+# TH1F hdc_trk_beta_pi 'HMS DC Pion Track Beta; Beta; Number of Entires' H.tr.beta 300 -1.5 1.5 hcut_CleanTrack&&hcut_cer_pi
-TH1F hdc_trk_mom_elec 'HMS DC Electron Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6 hcut_CleanTrack&&hcut_cer_elec
-TH1F hdc_trk_mom_pi 'HMS DC Pion Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6 hcut_CleanTrack&&hcut_cer_pi
+# TH1F hdc_trk_mom_elec 'HMS DC Electron Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6 hcut_CleanTrack&&hcut_cer_elec
+# TH1F hdc_trk_mom_pi 'HMS DC Pion Track Momentum; P (GeV); Number of Entires / 10 MeV' H.tr.p 600 0 6 hcut_CleanTrack&&hcut_cer_pi
#----------------------------------------------------------------
# HMS HODO TRACKING, TIMING AND Particle ID (PID) - BETA (v/c)
@@ -76,12 +76,12 @@ TH1F hhodo_beta 'HMS Hodo Beta; Beta; Number of Entries / 0.015' H.hod.beta 100
TH1F hhodo_fpHitsTime 'HMS Hodo Focal Plane Time; Focal Plane Time (ns); Number of Entries / 1 ns' H.hod.fpHitsTime 90 0 90
TH1F hhodo_starttime 'HMS Hodo Start Time; Start Time (ns); Number of Entries / 1ns' H.hod.starttime 90 0 90
TH1F hhodo_good_startime 'HMS Hodo Good Start Flag; Good Start Time Flag (=1 is good); Number of Entries' H.hod.goodstarttime 5 0 5
-#TH2F hhodo_xhod_vs_yhod 'HMS Hodo Projected X vs. Y; Y_hodo(cm) / 1mm; X_hodo(cm) / 1mm' H.hod.y_hodo H.hod.x_hodo 1000 -50 50 1000 -50 50
-TH1F hhodo_1x_diffdistrack 'HMS Hodo 1X Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.1x.DiffDisTrack 100 -10. 10.
-TH1F hhodo_1y_diffdistrack 'HMS Hodo 1Y Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.1y.DiffDisTrack 100 -10. 10.
-TH1F hhodo_2x_diffdistrack 'HMS Hodo 2X Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.2x.DiffDisTrack 100 -10. 10.
-TH1F hhodo_2y_diffdistrack 'HMS Hodo 2Y Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.2y.DiffDisTrack 100 -10. 10.
-TH2F hhodo_1x_diffdistrack_v_xtrack 'HMS Hodo 1X Diff Distance track (cm) versus Track X (cm); Diff distance (cm); X track (cm)' H.hod.1x.DiffDisTrack H.hod.1x.TrackXPos 100 -10. 10. 200 -100 100
-TH2F hhodo_1y_diffdistrack_v_ytrack 'HMS Hodo 1Y Diff Distance track (cm) versus Track Y (cm); Diff distance (cm); Y track (cm)' H.hod.1y.DiffDisTrack H.hod.1y.TrackYPos 100 -10. 10. 240 -60 60
-TH2F hhodo_2x_diffdistrack_v_xtrack 'HMS Hodo 2X Diff Distance track (cm) versus Track X (cm); Diff distance (cm); X track (cm)' H.hod.2x.DiffDisTrack H.hod.2x.TrackXPos 100 -10. 10. 200 -100 100
-TH2F hhodo_2y_diffdistrack_v_ytrack 'HMS Hodo 2Y Diff Distance track (cm) versus Track Y (cm); Diff distance (cm); Y track (cm)' H.hod.2y.DiffDisTrack H.hod.2y.TrackYPos 100 -10. 10. 240 -60 60
\ No newline at end of file
+# TH2F hhodo_xhod_vs_yhod 'HMS Hodo Projected X vs. Y; Y_hodo(cm) / 1mm; X_hodo(cm) / 1mm' H.hod.y_hodo H.hod.x_hodo 1000 -50 50 1000 -50 50
+# TH1F hhodo_1x_diffdistrack 'HMS Hodo 1X Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.1x.DiffDisTrack 100 -10. 10.
+# TH1F hhodo_1y_diffdistrack 'HMS Hodo 1Y Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.1y.DiffDisTrack 100 -10. 10.
+# TH1F hhodo_2x_diffdistrack 'HMS Hodo 2X Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.2x.DiffDisTrack 100 -10. 10.
+# TH1F hhodo_2y_diffdistrack 'HMS Hodo 2Y Diff Distance track (cm); Diff distance (cm); Counts ' H.hod.2y.DiffDisTrack 100 -10. 10.
+# TH2F hhodo_1x_diffdistrack_v_xtrack 'HMS Hodo 1X Diff Distance track (cm) versus Track X (cm); Diff distance (cm); X track (cm)' H.hod.1x.DiffDisTrack H.hod.1x.TrackXPos 100 -10. 10. 200 -100 100
+# TH2F hhodo_1y_diffdistrack_v_ytrack 'HMS Hodo 1Y Diff Distance track (cm) versus Track Y (cm); Diff distance (cm); Y track (cm)' H.hod.1y.DiffDisTrack H.hod.1y.TrackYPos 100 -10. 10. 240 -60 60
+# TH2F hhodo_2x_diffdistrack_v_xtrack 'HMS Hodo 2X Diff Distance track (cm) versus Track X (cm); Diff distance (cm); X track (cm)' H.hod.2x.DiffDisTrack H.hod.2x.TrackXPos 100 -10. 10. 200 -100 100
+# TH2F hhodo_2y_diffdistrack_v_ytrack 'HMS Hodo 2Y Diff Distance track (cm) versus Track Y (cm); Diff distance (cm); Y track (cm)' H.hod.2y.DiffDisTrack H.hod.2y.TrackYPos 100 -10. 10. 240 -60 60
\ No newline at end of file
diff --git a/DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def b/DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def
index 9a06630f95238fd271da297d5e6cc4d563639333..9967d3bbddaa6895a8e8afec7bfd7d0dbd3c1c73 100644
--- a/DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def
+++ b/DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def
@@ -5,33 +5,33 @@
# Assume FADC range is set to 1V and the integration is 25 channels
# Offset in the FADC is about 0.122V or 500 channels.
-formula FRXA_V H.rb.raster.frxaRawAdc*(1./4096.)/25.
-formula FRXB_V H.rb.raster.frxbRawAdc*(1./4096.)/25.
-formula FRYA_V H.rb.raster.fryaRawAdc*(1./4096.)/25.
-formula FRYB_V H.rb.raster.frybRawAdc*(1./4096.)/25.
-
-TH1F hFRXA 'HMS FRXA; FRXA RAW ADC (chan); Counts' H.rb.raster.frxaRawAdc 1000 0 100000 H.dc.ntrack>0
-TH1F hFRXA_V 'HMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0 H.dc.ntrack>0
-TH1F hFRYA 'HMS FRYA; FRYA RAW ADC (chan); Counts' H.rb.raster.fryaRawAdc 1000 0 100000 H.dc.ntrack>0
-TH1F hFRYA_V 'HMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0 H.dc.ntrack>0
-
-TH1F hFRXB 'HMS FRXB; FRXB RAW ADC (chan); Counts' H.rb.raster.frxbRawAdc 1000 0 100000 H.dc.ntrack>0
-TH1F hFRXB_V 'HMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0 H.dc.ntrack>0
-TH1F hFRYB 'HMS FRYB; FRYB RAW ADC (chan); Counts' H.rb.raster.frybRawAdc 1000 0 100000 H.dc.ntrack>0
-TH1F hFRYB_V 'HMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0 H.dc.ntrack>0
-
-TH1F hFRXA 'HMS FRXA; FRXA ADC (chan); Counts' H.rb.raster.frxa_adc 100 -50000 50000 H.dc.ntrack>0
-TH1F hFRXB 'HMS FRXB; FRXB ADC (chan); Counts' H.rb.raster.frxb_adc 100 -50000 50000 H.dc.ntrack>0
-TH1F hFRYA 'HMS FRYA; FRYA ADC (chan); Counts' H.rb.raster.frya_adc 100 -50000 50000 H.dc.ntrack>0
-TH1F hFRYB 'HMS FRYB; FRYB ADC (chan); Counts' H.rb.raster.fryb_adc 100 -50000 50000 H.dc.ntrack>0
-
-TH1F hFRXApos 'HMS FRXApos; FRXA POS (CM); Counts' H.rb.raster.fr_xa 100 -0.5 0.5 H.dc.ntrack>0
-TH1F hFRXBpos 'HMS FRXBpos; FRXB POS (CM); Counts' H.rb.raster.fr_xb 100 -0.5 0.5 H.dc.ntrack>0
-TH1F hFRYApos 'HMS FRYApos; FRYA POS (CM); Counts' H.rb.raster.fr_ya 100 -0.5 0.5 H.dc.ntrack>0
-TH1F hFRYBpos 'HMS FRYBpos; FRYB POS (CM); Counts' H.rb.raster.fr_yb 100 -0.5 0.5 H.dc.ntrack>0
-
-TH2F hFRAraw_XvsY 'HMS FRA Raw X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXAraw_V FRYAraw_V 100 0 1.0 100 0 1.0 H.dc.ntrack>0
-TH2F hFRBraw_XvsY 'HMS FRB Raw X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXBraw_V FRYBraw_V 100 0 1.0 100 0 1.0 H.dc.ntrack>0
+formula FRXAraw_V H.rb.raster.frxaRawAdc*(1./4096.)/25.
+formula FRXBraw_V H.rb.raster.frxbRawAdc*(1./4096.)/25.
+formula FRYAraw_V H.rb.raster.fryaRawAdc*(1./4096.)/25.
+formula FRYBraw_V H.rb.raster.frybRawAdc*(1./4096.)/25.
+
+# TH1F hFRXAraw 'HMS FRXA; FRXA RAW ADC (chan); Counts' H.rb.raster.frxaRawAdc 1000 0 100000 H.dc.ntrack>0
+# TH1F hFRXAraw_V 'HMS FRXA; FRXA RAW ADC (Volts); Counts' FRXAraw_V 1000 0 1.0 H.dc.ntrack>0
+# TH1F hFRYAraw 'HMS FRYA; FRYA RAW ADC (chan); Counts' H.rb.raster.fryaRawAdc 1000 0 100000 H.dc.ntrack>0
+# TH1F hFRYAraw_V 'HMS FRYA; FRYA RAW ADC (Volts); Counts' FRYAraw_V 1000 0 1.0 H.dc.ntrack>0
+
+# TH1F hFRXBraw 'HMS FRXB; FRXB RAW ADC (chan); Counts' H.rb.raster.frxbRawAdc 1000 0 100000 H.dc.ntrack>0
+# TH1F hFRXBraw_V 'HMS FRXB; FRXB RAW ADC (Volts); Counts' FRXBraw_V 1000 0 1.0 H.dc.ntrack>0
+# TH1F hFRYBraw 'HMS FRYB; FRYB RAW ADC (chan); Counts' H.rb.raster.frybRawAdc 1000 0 100000 H.dc.ntrack>0
+# TH1F hFRYBraw_V 'HMS FRYB; FRYB RAW ADC (Volts); Counts' FRYBraw_V 1000 0 1.0 H.dc.ntrack>0
+
+# TH1F hFRXA 'HMS FRXA; FRXA ADC (chan); Counts' H.rb.raster.frxa_adc 100 -50000 50000 H.dc.ntrack>0
+# TH1F hFRXB 'HMS FRXB; FRXB ADC (chan); Counts' H.rb.raster.frxb_adc 100 -50000 50000 H.dc.ntrack>0
+# TH1F hFRYA 'HMS FRYA; FRYA ADC (chan); Counts' H.rb.raster.frya_adc 100 -50000 50000 H.dc.ntrack>0
+# TH1F hFRYB 'HMS FRYB; FRYB ADC (chan); Counts' H.rb.raster.fryb_adc 100 -50000 50000 H.dc.ntrack>0
+
+# TH1F hFRXApos 'HMS FRXApos; FRXA POS (CM); Counts' H.rb.raster.fr_xa 100 -0.5 0.5 H.dc.ntrack>0
+# TH1F hFRXBpos 'HMS FRXBpos; FRXB POS (CM); Counts' H.rb.raster.fr_xb 100 -0.5 0.5 H.dc.ntrack>0
+# TH1F hFRYApos 'HMS FRYApos; FRYA POS (CM); Counts' H.rb.raster.fr_ya 100 -0.5 0.5 H.dc.ntrack>0
+# TH1F hFRYBpos 'HMS FRYBpos; FRYB POS (CM); Counts' H.rb.raster.fr_yb 100 -0.5 0.5 H.dc.ntrack>0
+
+# TH2F hFRAraw_XvsY 'HMS FRA Raw X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXAraw_V FRYAraw_V 100 0 1.0 100 0 1.0 H.dc.ntrack>0
+# TH2F hFRBraw_XvsY 'HMS FRB Raw X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXBraw_V FRYBraw_V 100 0 1.0 100 0 1.0 H.dc.ntrack>0
TH2F hFRApos_XvsY 'HMS FRA X vs Y; FRA X Position (cm); FRA Y Position (cm)' H.rb.raster.fr_xa H.rb.raster.fr_ya 40 -0.2 0.2 40 -0.2 0.2 H.dc.ntrack>0
TH2F hFRBpos_XvsY 'HMS FRB X vs Y; FRB X Position (cm); FRB Y Position (cm)' H.rb.raster.fr_xb H.rb.raster.fr_yb 40 -0.2 0.2 40 -0.2 0.2 H.dc.ntrack>0
diff --git a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
index 07228671c1368d7a684443273345a230cdbe1bc9..4d82bd503608050bee07da6e0a15fd1d79085b12 100644
--- a/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
+++ b/DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def
@@ -2,34 +2,34 @@
# Trigger Apparatus *
#********************
-TH1F htrig_h1x_tdc_mult 'HMS h1x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h1X_tdcMultiplicity 11 0 11
-TH1F htrig_h1y_tdc_mult 'HMS h1y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h1Y_tdcMultiplicity 11 0 11
-TH1F htrig_h2x_tdc_mult 'HMS h2x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h2X_tdcMultiplicity 11 0 11
-TH1F htrig_h2y_tdc_mult 'HMS h2y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h2Y_tdcMultiplicity 11 0 11
+# TH1F htrig_h1x_tdc_mult 'HMS h1x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h1X_tdcMultiplicity 11 0 11
+# TH1F htrig_h1y_tdc_mult 'HMS h1y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h1Y_tdcMultiplicity 11 0 11
+# TH1F htrig_h2x_tdc_mult 'HMS h2x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h2X_tdcMultiplicity 11 0 11
+# TH1F htrig_h2y_tdc_mult 'HMS h2y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h2Y_tdcMultiplicity 11 0 11
-TH1F htrig_h1T_tdc_mult 'HMS h1x/h1y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h1T_tdcMultiplicity 11 0 11
-TH1F htrig_h2T_tdc_mult 'HMS h2x/h2y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h2T_tdcMultiplicity 11 0 11
+# TH1F htrig_h1T_tdc_mult 'HMS h1x/h1y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h1T_tdcMultiplicity 11 0 11
+# TH1F htrig_h2T_tdc_mult 'HMS h2x/h2y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.hms.h2T_tdcMultiplicity 11 0 11
-TH1F htrig_hT1_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 2, Channel 6); TDC Multiplicity; Counts / 1' T.hms.hT1_tdcMultiplicity 11 0 11
-TH1F htrig_hT2_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 20, Channel 127); TDC Multiplicity; Counts / 1' T.hms.hT2_tdcMultiplicity 11 0 11
-TH1F htrig_hT3_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 2, Channel 63); TDC Multiplicity; Counts / 1' T.hms.hT3_tdcMultiplicity 11 0 11
+# TH1F htrig_hT1_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 2, Channel 6); TDC Multiplicity; Counts / 1' T.hms.hT1_tdcMultiplicity 11 0 11
+# TH1F htrig_hT2_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 20, Channel 127); TDC Multiplicity; Counts / 1' T.hms.hT2_tdcMultiplicity 11 0 11
+# TH1F htrig_hT3_tdc_mult 'HMS h1x/h1y/h2x/h2y Coincidence TDC Multiplicity (Slot 2, Channel 63); TDC Multiplicity; Counts / 1' T.hms.hT3_tdcMultiplicity 11 0 11
TH1F htrig_h1x_good_tdc 'HMS h1x Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h1X_tdcTime 800 0 800
TH1F htrig_h1y_good_tdc 'HMS h1y Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h1Y_tdcTime 800 0 800
TH1F htrig_h2x_good_tdc 'HMS h2x Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h2X_tdcTime 800 0 800
TH1F htrig_h2y_good_tdc 'HMS h2y Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h2Y_tdcTime 800 0 800
-TH1F htrig_h1T_good_tdc 'HMS h1x/h1y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h1T_tdcTime 350 0 3500
-TH1F htrig_h2T_good_tdc 'HMS h2x/h2y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h2T_tdcTime 350 0 3500
+# TH1F htrig_h1T_good_tdc 'HMS h1x/h1y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h1T_tdcTime 350 0 3500
+# TH1F htrig_h2T_good_tdc 'HMS h2x/h2y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.hms.h2T_tdcTime 350 0 3500
TH1F htrig_hT1_good_tdc 'HMS hT1 Good TDC Time (Slot 2, Channel 6); Good Time (ns); Counts / 1 ns' T.hms.hT1_tdcTime 350 0 3500
TH1F htrig_hT2_good_tdc 'HMS hT2 Good TDC Time (Slot 20, Channel 127); Good Time (ns); Counts / 1 ns' T.hms.hT2_tdcTime 350 0 3500
TH1F htrig_hT3_good_tdc 'HMS hT3 Good TDC Time (Slot 2, Channel 63); Good Time (ns); Counts / 1 ns' T.hms.hT3_tdcTime 350 0 3500
-TH2F htrig_ch1xy_ch2x 'HMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.hms.h1T_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300
-TH2F htrig_ch1x_ch2x 'HMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)' T.hms.h1X_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300
-TH2F htrig_ch1y_ch2x 'HMS Hodo Trig; 1Y Trig (ns); 2X Trig (ns)' T.hms.h1Y_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300
-TH2F htrig_ch1y_ch1x 'HMS Hodo Trig; 1X Trig (ns); 1Y Trig (ns)' T.hms.h1X_tdcTime T.hms.h1Y_tdcTime 200 100 300 200 100 300
+# TH2F htrig_ch1xy_ch2x 'HMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.hms.h1T_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300
+# TH2F htrig_ch1x_ch2x 'HMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)' T.hms.h1X_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300
+# TH2F htrig_ch1y_ch2x 'HMS Hodo Trig; 1Y Trig (ns); 2X Trig (ns)' T.hms.h1Y_tdcTime T.hms.h2X_tdcTime 200 100 300 200 100 300
+# TH2F htrig_ch1y_ch1x 'HMS Hodo Trig; 1X Trig (ns); 1Y Trig (ns)' T.hms.h1X_tdcTime T.hms.h1Y_tdcTime 200 100 300 200 100 300
TH1F htrig_hFADC_TREF_ROC1_good_tdc 'HMS hFADC_TREF_ROC1 Good Pulse Time; Good Pulse Time (ns); Counts / 1 ns' T.hms.hFADC_TREF_ROC1_adcPulseTime 800 0 800
@@ -37,26 +37,27 @@ TH1F htrig_hFADC_TREF_ROC1_good_tdc 'HMS hFADC_TREF_ROC1 Good Pulse Time; Good P
# HMS DC TRIG Reference Time
#----------------------------
-TH1F htrig_hdc_ref1 'HMS DC Reference Time 1; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF1_tdcTime 2000 0 2000
-TH1F htrig_hdc_ref2 'HMS DC Reference Time 2; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF2_tdcTime 2000 0 2000
-TH1F htrig_hdc_ref3 'HMS DC Reference Time 3; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF3_tdcTime 2000 0 2000
-TH1F htrig_hdc_ref4 'HMS DC Reference Time 4; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF4_tdcTime 2000 0 2000
+TH1F htrig_hdc_ref1 'HMS DC Reference Time 1; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF1_tdcTime 2300 0 2300
+TH1F htrig_hdc_ref2 'HMS DC Reference Time 2; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF2_tdcTime 2300 0 2300
+TH1F htrig_hdc_ref3 'HMS DC Reference Time 3; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF3_tdcTime 2300 0 2300
+TH1F htrig_hdc_ref4 'HMS DC Reference Time 4; TDC Time (ns); Counts / 1 ns;' T.hms.hDCREF4_tdcTime 2300 0 2300
#--------------------------------------
# HMS Trigger Rate vs. 1MHz Clock Time
#--------------------------------------
-TH2D htrig1rate_vs_time 'HMS Trig1 Rate vs. Time; 1 MHz Clock Time (s); hTRIG1 Rate (Hz)' H.1MHz.scalerTime H.hTRIG1.scalerRate 350 0 7000 500 0 200000
-TH2D htrig2rate_vs_time 'HMS Trig2 Rate vs. Time; 1 MHz Clock Time (s); hTRIG2 Rate (Hz)' H.1MHz.scalerTime H.hTRIG2.scalerRate 350 0 7000 500 0 200000
-TH2D htrig3rate_vs_time 'HMS Trig3 Rate vs. Time; 1 MHz Clock Time (s); hTRIG3 Rate (Hz)' H.1MHz.scalerTime H.hTRIG3.scalerRate 350 0 7000 500 0 200000
-TH2D htrig4rate_vs_time 'HMS Trig4 Rate vs. Time; 1 MHz Clock Time (s); hTRIG4 Rate (Hz)' H.1MHz.scalerTime H.hTRIG4.scalerRate 350 0 7000 500 0 200000
-TH2D htrig6rate_vs_time 'HMS Trig6 Rate vs. Time; 1 MHz Clock Time (s); hTRIG6 Rate (Hz)' H.1MHz.scalerTime H.hTRIG6.scalerRate 350 0 7000 500 0 200000
+# TH2D htrig1rate_vs_time 'HMS Trig1 Rate vs. Time; 1 MHz Clock Time (s); hTRIG1 Rate (Hz)' H.1MHz.scalerTime H.hTRIG1.scalerRate 350 0 7000 500 0 200000
+# TH2D htrig2rate_vs_time 'HMS Trig2 Rate vs. Time; 1 MHz Clock Time (s); hTRIG2 Rate (Hz)' H.1MHz.scalerTime H.hTRIG2.scalerRate 350 0 7000 500 0 200000
+# TH2D htrig3rate_vs_time 'HMS Trig3 Rate vs. Time; 1 MHz Clock Time (s); hTRIG3 Rate (Hz)' H.1MHz.scalerTime H.hTRIG3.scalerRate 350 0 7000 500 0 200000
+# TH2D htrig4rate_vs_time 'HMS Trig4 Rate vs. Time; 1 MHz Clock Time (s); hTRIG4 Rate (Hz)' H.1MHz.scalerTime H.hTRIG4.scalerRate 350 0 7000 500 0 200000
+# TH2D htrig6rate_vs_time 'HMS Trig6 Rate vs. Time; 1 MHz Clock Time (s); hTRIG6 Rate (Hz)' H.1MHz.scalerTime H.hTRIG6.scalerRate 350 0 7000 500 0 200000
#--------------------------------------
# HMS DC Ref time vs Hodo Ref time
#--------------------------------------
-TH2D hms_dcref_vs_hodoref 'HMS HODO REF (hT2) vs. HMS DC REF 1; hT2 TDC Time Raw; DCREF1 TDC Time Raw' T.hms.hT2_tdcTimeRaw T.hms.hDCREF1_tdcTimeRaw 160 1400 3000 140 14800 16200
+# TH2D hms_dcref_vs_hodoref 'HMS HODO REF (hT2) vs. HMS DC REF 1; hT2 TDC Time Raw; DCREF1 TDC Time Raw' T.hms.hT2_tdcTimeRaw T.hms.hDCREF1_tdcTimeRaw 160 1400 3000 140 14800 16200
+TH2D hms_dcref_vs_hodoref 'HMS HODO REF (hT2) vs. HMS DC REF 1; hT2 TDC Time Raw; DCREF1 TDC Time Raw' T.hms.hT2_tdcTimeRaw T.hms.hDCREF1_tdcTimeRaw 200 3000 5000 130 16500 17800
#--------------------------------
# HMS Trigger ADC Pulse pedestals
diff --git a/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def b/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
index 449cc19108ad9c88a18b2c2d93cad5b5dd9e4d0f..5fff104b785330ac9517183f82b29526b9500640 100644
--- a/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
@@ -13,11 +13,11 @@ TH1F paero_good_occ_pos 'SHMS Aero+ Good Occupancy; PMT Number; Number of Good +
TH1F paero_good_occ_neg 'SHMS Aero- Good Occupancy; PMT Number; Number of Good -ADC Hits' P.aero.numGoodNegAdcHits 7 0.5 7.5
TH1F paero_good_mult_pos 'SHMS Aero+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.aero.totNumGoodPosAdcHits 7 0.5 7.5
TH1F paero_good_mult_neg 'SHMS Aero- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.aero.totNumGoodNegAdcHits 7 0.5 7.5
-TH1F paero_good_mult 'SHMS Aero Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.aero.totnumGoodAdcHits 14 0.5 14.5
+# TH1F paero_good_mult 'SHMS Aero Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.aero.totnumGoodAdcHits 14 0.5 14.5
-TH1F paero_tot_npe_pos 'SHMS Aero+ Total NPE; Total Number of Pos Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.posNpeSum 100 0 50 P.aero.posNpeSum>0.0
-TH1F paero_tot_npe_neg 'SHMS Aero- Total NPE; Total Number of Neg Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.negNpeSum 100 0 50 P.aero.negNpeSum>0.0
-TH1F paero_tot_npe 'SHMS Aero Total NPE; Total NPE; Number of Entries / 0.5 Photoelectrons' P.aero.npeSum 100 0 50 P.aero.npeSum>0.0
+# TH1F paero_tot_npe_pos 'SHMS Aero+ Total NPE; Total Number of Pos Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.posNpeSum 100 0 50 P.aero.posNpeSum>0.0
+# TH1F paero_tot_npe_neg 'SHMS Aero- Total NPE; Total Number of Neg Photoelectrons; Number of Entries / 0.5 Photoelectrons' P.aero.negNpeSum 100 0 50 P.aero.negNpeSum>0.0
+# TH1F paero_tot_npe 'SHMS Aero Total NPE; Total NPE; Number of Entries / 0.5 Photoelectrons' P.aero.npeSum 100 0 50 P.aero.npeSum>0.0
TH2F paero_npe_pos 'SHMS Aero+ NPE vs. PMT Number; PMT Number; NPE / 0.5 Photoelectrons' [I+1] P.aero.posNpe 7 0.5 7.5 60 0 30 P.aero.posNpe>0.0
TH2F paero_npe_neg 'SHMS Aero- NPE vs. PMT Number; PMT Number; NPE / 0.5 Photoelectrons' [I+1] P.aero.negNpe 7 0.5 7.5 60 0 30 P.aero.negNpe>0.0
@@ -26,9 +26,9 @@ TH2F paero_npe_neg 'SHMS Aero- NPE vs. PMT Number; PMT Number; NPE / 0.5 Photoel
# SHMS AERO TRACK PROJECTION
#----------------------------
-TH1F paero_xtrack 'SHMS Aerogel Tracking X; X (cm); Number of Entries / 1 cm' P.aero.xAtAero 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
-TH1F paero_ytrack 'SHMS Aerogel Tracking Y; Y (cm); Number of Entries / 1 cm' P.aero.yAtAero 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
-TH2F paero_xytrack 'SHMS Aerogel Tracking Y vs X; Y (cm) / 1 cm; X (cm) / 1 cm' P.aero.yAtAero P.aero.xAtAero 120 -60 60 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
+# TH1F paero_xtrack 'SHMS Aerogel Tracking X; X (cm); Number of Entries / 1 cm' P.aero.xAtAero 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
+# TH1F paero_ytrack 'SHMS Aerogel Tracking Y; Y (cm); Number of Entries / 1 cm' P.aero.yAtAero 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
+TH2F paero_xytrack 'SHMS Aerogel Tracking Y vs X; Y (cm) / 1 cm; X (cm) / 1 cm' P.aero.yAtAero P.aero.xAtAero 120 -60 60 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
TH2F paero_x_vs_npe 'SHMS Aerogel X vs NPE; NPE / 0.5 PE ; X (cm) / 1 cm' P.aero.npeSum P.aero.xAtAero 60 0 30 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
TH2F paero_y_vs_npe 'SHMS Aerogel Y vs NPE; NPE / 0.5 PE ; Y (cm) / 1 cm' P.aero.npeSum P.aero.yAtAero 60 0 30 120 -60 60 P.aero.xAtAero!=0.0&&P.aero.yAtAero!=0
diff --git a/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def b/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
index 7ecd09d06923bc48ba1d37aa1381a4493d28df65..31524063f4062805cc5abd3ecf20a00b39baeb5d 100644
--- a/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
@@ -10,7 +10,7 @@ TH1F pcal_prshwr_good_occ_pos 'SHMS PreShower+ Good Occupancy; PMT Number; Numbe
TH1F pcal_prshwr_good_occ_neg 'SHMS PreShower- Good Occupancy; PMT Number; Number of Good -ADC Hits' P.cal.pr.numGoodNegAdcHits 14 0.5 14.5
TH1F pcal_prshwr_good_mult_pos 'SHMS PreShower+ Good Multiplicity; Number of PMTs Hit; Total Number of Good +ADC Hits' P.cal.pr.totNumGoodPosAdcHits 14 0.5 14.5
TH1F pcal_prshwr_good_mult_neg 'SHMS PreShower- Good Multiplicity; Number of PMTs Hit; Total Number of Good -ADC Hits' P.cal.pr.totNumGoodNegAdcHits 14 0.5 14.5
-TH1F pcal_prshwr_good_mult 'SHMS PreShower Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.cal.pr.totnumGoodAdcHits 28 0.5 28.5
+# TH1F pcal_prshwr_good_mult 'SHMS PreShower Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.cal.pr.totnumGoodAdcHits 28 0.5 28.5
TH1F pcal_shwr_good_occ 'SHMS Shower Good Occupancy; PMT Number; Number of Good ADC Hits' P.cal.fly.numGoodAdcHits 224 0.5 224.5
TH1F pcal_shwr_good_mult 'SHMS Shower Good Multiplicity; Numer of PMTs Hit; Total Number of Good ADC Hits' P.cal.fly.totNumGoodAdcHits 40 0.5 40.5
diff --git a/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_decode_cuts.def b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_decode_cuts.def
index 469ff3fc90dac89735db325bb90c4d8424a57ae0..729e0295c5de1272806eb5e340c18519f7e1c50f 100644
--- a/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_decode_cuts.def
+++ b/DEF-files/SHMS/PRODUCTION/CUTS/pstackana_decode_cuts.def
@@ -3,6 +3,8 @@ Block: Decode
pcut_TRIG1 T.shms.pTRIG1_tdcTimeRaw > 0
pcut_TRIG2 T.shms.pTRIG2_tdcTimeRaw > 0
pcut_TRIG3 T.shms.pTRIG3_tdcTimeRaw > 0
+pcut_TRIG4 T.shms.pTRIG3_tdcTimeRaw > 0
+pcut_TRIG5 T.shms.pTRIG5_tdcTimeRaw > 0
SHMS_Pretrig pcut_TRIG1 || pcut_TRIG2 || pcut_TRIG3
shms_trigs SHMS_event
diff --git a/DEF-files/SHMS/PRODUCTION/DC/pdc_eff_histos.def b/DEF-files/SHMS/PRODUCTION/DC/pdc_eff_histos.def
new file mode 100644
index 0000000000000000000000000000000000000000..5b9ac696de02cd0662a6e5d508589aa186729d94
--- /dev/null
+++ b/DEF-files/SHMS/PRODUCTION/DC/pdc_eff_histos.def
@@ -0,0 +1,41 @@
+#**********************
+# SHMS Drift Chambers *
+#**********************
+
+#------------------
+# SHMS DC WIRE MAP for per wire efficiency
+# first set with "should" cut
+#-----------------
+
+TH1F pdc1u1_wirenum_should 'SHMS DC 1U1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[0] 107 0.5 107.5
+TH1F pdc1u2_wirenum_should 'SHMS DC 1U2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[1] 107 0.5 107.5
+TH1F pdc1x1_wirenum_should 'SHMS DC 1X1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[2] 79 0.5 79.5
+TH1F pdc1x2_wirenum_should 'SHMS DC 1X2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[3] 79 0.5 79.5
+TH1F pdc1v1_wirenum_should 'SHMS DC 1V1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[4] 107 0.5 107.5
+TH1F pdc1v2_wirenum_should 'SHMS DC 1V2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[5] 107 0.5 107.5
+
+TH1F pdc2v2_wirenum_should 'SHMS DC 2V2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[6] 107 0.5 107.5
+TH1F pdc2v1_wirenum_should 'SHMS DC 2V1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[7] 107 0.5 107.5
+TH1F pdc2x2_wirenum_should 'SHMS DC 2X2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[8] 79 0.5 79.5
+TH1F pdc2x1_wirenum_should 'SHMS DC 2X1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[9] 79 0.5 79.5
+TH1F pdc2u2_wirenum_should 'SHMS DC 2U2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[10] 107 0.5 107.5
+TH1F pdc2u1_wirenum_should 'SHMS DC 2U1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitShould[11] 107 0.5 107.5
+#------------------
+# SHMS DC WIRE MAP for per wire efficiency
+# first set with "did" cut
+#-----------------
+
+TH1F pdc1u1_wirenum_did 'SHMS DC 1U1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[0] 107 0.5 107.5
+TH1F pdc1u2_wirenum_did 'SHMS DC 1U2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[1] 107 0.5 107.5
+TH1F pdc1x1_wirenum_did 'SHMS DC 1X1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[2] 79 0.5 79.5
+TH1F pdc1x2_wirenum_did 'SHMS DC 1X2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[3] 79 0.5 79.5
+TH1F pdc1v1_wirenum_did 'SHMS DC 1V1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[4] 107 0.5 107.5
+TH1F pdc1v2_wirenum_did 'SHMS DC 1V2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[5] 107 0.5 107.5
+
+TH1F pdc2v2_wirenum_did 'SHMS DC 2V2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[6] 107 0.5 107.5
+TH1F pdc2v1_wirenum_did 'SHMS DC 2V1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[7] 107 0.5 107.5
+TH1F pdc2x2_wirenum_did 'SHMS DC 2X2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[8] 79 0.5 79.5
+TH1F pdc2x1_wirenum_did 'SHMS DC 2X1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[9] 79 0.5 79.5
+TH1F pdc2u2_wirenum_did 'SHMS DC 2U2 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[10] 107 0.5 107.5
+TH1F pdc2u1_wirenum_did 'SHMS DC 2U1 Wiremap; Wire Number; Number of Entries' P.dc.wireHitDid[11] 107 0.5 107.5
+
diff --git a/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def b/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
index e9961685c76f68299837395a5358cf72a52d5887..d550b70046bac99bdf2b55a3c326273b79424a05 100644
--- a/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
@@ -1,20 +1,38 @@
+#------------------
+# SHMS DC RAW WIRE MAP
+#------------------
+
+TH1F pdc1u1_rawwirenum 'SHMS DC 1U1 Wiremap; Wire Number (all hits); Number of Entries' P.dc.1u1.raw.wirenum 107 0.5 107.5
+TH1F pdc1u2_rawwirenum 'SHMS DC 1U2 Wiremap; Wire Number (all hits); Number of Entries' P.dc.1u2.raw.wirenum 107 0.5 107.5
+TH1F pdc1x1_rawwirenum 'SHMS DC 1X1 Wiremap; Wire Number (all hits); Number of Entries' P.dc.1x1.raw.wirenum 79 0.5 79.5
+TH1F pdc1x2_rawwirenum 'SHMS DC 1X2 Wiremap; Wire Number (all hits); Number of Entries' P.dc.1x2.raw.wirenum 79 0.5 79.5
+TH1F pdc1v1_rawwirenum 'SHMS DC 1V1 Wiremap; Wire Number (all hits); Number of Entries' P.dc.1v1.raw.wirenum 107 0.5 107.5
+TH1F pdc1v2_rawwirenum 'SHMS DC 1V2 Wiremap; Wire Number (all hits); Number of Entries' P.dc.1v2.raw.wirenum 107 0.5 107.5
+
+TH1F pdc2v2_rawwirenum 'SHMS DC 2V2 Wiremap; Wire Number (all hits); Number of Entries' P.dc.2v2.raw.wirenum 107 0.5 107.5
+TH1F pdc2v1_rawwirenum 'SHMS DC 2V1 Wiremap; Wire Number (all hits); Number of Entries' P.dc.2v1.raw.wirenum 107 0.5 107.5
+TH1F pdc2x2_rawwirenum 'SHMS DC 2X2 Wiremap; Wire Number (all hits); Number of Entries' P.dc.2x2.raw.wirenum 79 0.5 79.5
+TH1F pdc2x1_rawwirenum 'SHMS DC 2X1 Wiremap; Wire Number (all hits); Number of Entries' P.dc.2x1.raw.wirenum 79 0.5 79.5
+TH1F pdc2u2_rawwirenum 'SHMS DC 2U2 Wiremap; Wire Number (all hits); Number of Entries' P.dc.2u2.raw.wirenum 107 0.5 107.5
+TH1F pdc2u1_rawwirenum 'SHMS DC 2U1 Wiremap; Wire Number (all hits); Number of Entries' P.dc.2u1.raw.wirenum 107 0.5 107.5
+
#------------------
# SHMS DC WIRE MAP
#------------------
-TH1F pdc1u1_wirenum 'SHMS DC 1U1 Wiremap; Wire Number; Number of Entries' P.dc.1u1.wirenum 107 0.5 107.5
-TH1F pdc1u2_wirenum 'SHMS DC 1U2 Wiremap; Wire Number; Number of Entries' P.dc.1u2.wirenum 107 0.5 107.5
-TH1F pdc1x1_wirenum 'SHMS DC 1X1 Wiremap; Wire Number; Number of Entries' P.dc.1x1.wirenum 79 0.5 79.5
-TH1F pdc1x2_wirenum 'SHMS DC 1X2 Wiremap; Wire Number; Number of Entries' P.dc.1x2.wirenum 79 0.5 79.5
-TH1F pdc1v1_wirenum 'SHMS DC 1V1 Wiremap; Wire Number; Number of Entries' P.dc.1v1.wirenum 107 0.5 107.5
-TH1F pdc1v2_wirenum 'SHMS DC 1V2 Wiremap; Wire Number; Number of Entries' P.dc.1v2.wirenum 107 0.5 107.5
+TH1F pdc1u1_wirenum 'SHMS DC 1U1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.1u1.wirenum 107 0.5 107.5
+TH1F pdc1u2_wirenum 'SHMS DC 1U2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.1u2.wirenum 107 0.5 107.5
+TH1F pdc1x1_wirenum 'SHMS DC 1X1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.1x1.wirenum 79 0.5 79.5
+TH1F pdc1x2_wirenum 'SHMS DC 1X2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.1x2.wirenum 79 0.5 79.5
+TH1F pdc1v1_wirenum 'SHMS DC 1V1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.1v1.wirenum 107 0.5 107.5
+TH1F pdc1v2_wirenum 'SHMS DC 1V2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.1v2.wirenum 107 0.5 107.5
-TH1F pdc2v2_wirenum 'SHMS DC 2V2 Wiremap; Wire Number; Number of Entries' P.dc.2v2.wirenum 107 0.5 107.5
-TH1F pdc2v1_wirenum 'SHMS DC 2V1 Wiremap; Wire Number; Number of Entries' P.dc.2v1.wirenum 107 0.5 107.5
-TH1F pdc2x2_wirenum 'SHMS DC 2X2 Wiremap; Wire Number; Number of Entries' P.dc.2x2.wirenum 79 0.5 79.5
-TH1F pdc2x1_wirenum 'SHMS DC 2X1 Wiremap; Wire Number; Number of Entries' P.dc.2x1.wirenum 79 0.5 79.5
-TH1F pdc2u2_wirenum 'SHMS DC 2U2 Wiremap; Wire Number; Number of Entries' P.dc.2u2.wirenum 107 0.5 107.5
-TH1F pdc2u1_wirenum 'SHMS DC 2U1 Wiremap; Wire Number; Number of Entries' P.dc.2u1.wirenum 107 0.5 107.5
+TH1F pdc2v2_wirenum 'SHMS DC 2V2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.2v2.wirenum 107 0.5 107.5
+TH1F pdc2v1_wirenum 'SHMS DC 2V1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.2v1.wirenum 107 0.5 107.5
+TH1F pdc2x2_wirenum 'SHMS DC 2X2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.2x2.wirenum 79 0.5 79.5
+TH1F pdc2x1_wirenum 'SHMS DC 2X1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.2x1.wirenum 79 0.5 79.5
+TH1F pdc2u2_wirenum 'SHMS DC 2U2 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.2u2.wirenum 107 0.5 107.5
+TH1F pdc2u1_wirenum 'SHMS DC 2U1 Wiremap; Wire Number (first hit in TDC window); Number of Entries' P.dc.2u1.wirenum 107 0.5 107.5
#------------------------------
# SHMS DC DRIFT TIME PER PLANE
diff --git a/DEF-files/SHMS/PRODUCTION/DC/pdc_vars.def b/DEF-files/SHMS/PRODUCTION/DC/pdc_vars.def
index aa642dd0defa62bc18d05a47b4c0dbe8b662f655..abff46a1d03eec131b65309529e17d8c48acd6b5 100644
--- a/DEF-files/SHMS/PRODUCTION/DC/pdc_vars.def
+++ b/DEF-files/SHMS/PRODUCTION/DC/pdc_vars.def
@@ -1,6 +1,6 @@
-**************************
-* Drift Chamber Variables
-**************************
+#**************************
+#* Drift Chamber Variables
+#**************************
block P.dc.x_fp
block P.dc.xp_fp
diff --git a/DEF-files/SHMS/PRODUCTION/EXTCOR/pextcor_histos.def b/DEF-files/SHMS/PRODUCTION/EXTCOR/pextcor_histos.def
index fde890cb91153884dc38f431bee51d465c7c65ef..ef58bc1adbd1479c41cca9571107e9ba9154a220 100644
--- a/DEF-files/SHMS/PRODUCTION/EXTCOR/pextcor_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/EXTCOR/pextcor_histos.def
@@ -2,7 +2,7 @@
# Extended Target Correction Histograms
#**************************************
-TH1F pextcor_xsieve 'SHMS Extended Target Correction X-Sieve; X_{sieve} (cm); Number of Entries / 0.1 cm' P.extcor.xsieve 300 -15 15 pcut_CleanTrack
-TH1F pextcor_ysieve 'SHMS Extended Target Correction Y-Sieve; Y_{sieve} (cm); Number of Entries / 0.1 cm' P.extcor.ysieve 200 -10 10 pcut_CleanTrack
+# TH1F pextcor_xsieve 'SHMS Extended Target Correction X-Sieve; X_{sieve} (cm); Number of Entries / 0.1 cm' P.extcor.xsieve 300 -15 15 pcut_CleanTrack
+# TH1F pextcor_ysieve 'SHMS Extended Target Correction Y-Sieve; Y_{sieve} (cm); Number of Entries / 0.1 cm' P.extcor.ysieve 200 -10 10 pcut_CleanTrack
TH2F pextcor_xysieve 'SHMS Extended Target Correction XY-Sieve; Y_{sieve} / 0.1 cm; X_{sieve} / 0.1 cm' P.extcor.ysieve P.extcor.xsieve 200 -10 10 300 -15 15 pcut_CleanTrack
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def b/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
index c0d32acf494767959eeb019668e469b17b08e328..3925f7aa20249e2f83e384ca7db439cabb36038c 100644
--- a/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
@@ -12,22 +12,22 @@ TH1F phgcer_good_occ 'SHMS Heavy Gas Cherenkov Good Occupancy; PMT Number; Numbe
TH1F phgcer_good_mult 'SHMS Heavy Gas Cherenkov Good Multiplicity; Number of PMTs Hit; Total Number of Good ADC Hits' P.hgcer.totNumGoodAdcHits 4 0.5 4.5
TH2F phgcer_npe 'SHMS Heavy Gas Cherenkov NPE vs. PMT Number; PMT Number; NPE / 0.5 Photoelectrons' [I+1] P.hgcer.npe 4 0.5 4.5 60 0 30 P.hgcer.npe>0.0
-TH1F phgcer_tot_npe 'SHMS Heavy Gas Cherenkov Total NPE; Total NPE; Number of Entries / 0.5 Photoelectrons' P.hgcer.npeSum 100 0 50 P.hgcer.npeSum>0.0
+# TH1F phgcer_tot_npe 'SHMS Heavy Gas Cherenkov Total NPE; Total NPE; Number of Entries / 0.5 Photoelectrons' P.hgcer.npeSum 100 0 50 P.hgcer.npeSum>0.0
#-------------------------
# SHMS HGC TRACK MATCHING
#-------------------------
-sTH1F phgcer_trk_match 'SHMS Heavy Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' P.hgcer.numTracksMatched 4 0.5 4.5
-sTH1F phgcer_trk_fired 'SHMS Heavy Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' P.hgcer.numTracksFired 4 0.5 4.5
+# sTH1F phgcer_trk_match 'SHMS Heavy Gas Cherenkov Track Matches; PMT Number; Number of Tracks Matched' P.hgcer.numTracksMatched 4 0.5 4.5
+# sTH1F phgcer_trk_fired 'SHMS Heavy Gas Cherenkov Tracks Fired; PMT Number; Number of Tracks Fired' P.hgcer.numTracksFired 4 0.5 4.5
#--------------------------
# SHMS HGC TRACK PROJECTION
#--------------------------
-TH1F phgcer_xtrack 'SHMS Heavy Gas Cherenkov Tracking X; X (cm); Number of Entries / 1 cm' P.hgcer.xAtCer 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
-TH1F phgcer_ytrack 'SHMS Heavy Gas Cherenkov Tracking Y; Y (cm); Number of Entries / 1 cm' P.hgcer.yAtCer 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
-TH2F phgcer_xytrack 'SHMS Heavy Gas Cherenkov Tracking Y vs X; Y (cm) / 1 cm; X (cm) / 1 cm' P.hgcer.yAtCer P.hgcer.xAtCer 120 -60 60 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
+# TH1F phgcer_xtrack 'SHMS Heavy Gas Cherenkov Tracking X; X (cm); Number of Entries / 1 cm' P.hgcer.xAtCer 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
+# TH1F phgcer_ytrack 'SHMS Heavy Gas Cherenkov Tracking Y; Y (cm); Number of Entries / 1 cm' P.hgcer.yAtCer 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
+TH2F phgcer_xytrack 'SHMS Heavy Gas Cherenkov Tracking Y vs X; Y (cm) / 1 cm; X (cm) / 1 cm' P.hgcer.yAtCer P.hgcer.xAtCer 120 -60 60 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
TH2F phgcer_x_vs_npe 'SHMS Heavy Gas Cherenkov X vs NPE; NPE / 0.5 PE ; X (cm) / 1 cm' P.hgcer.npeSum P.hgcer.xAtCer 60 0 30 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
TH2F phgcer_y_vs_npe 'SHMS Heavy Gas Cherenkov Y vs NPE; NPE / 0.5 PE ; Y (cm) / 1 cm' P.hgcer.npeSum P.hgcer.yAtCer 60 0 30 120 -60 60 P.hgcer.xAtCer!=0.0&&P.hgcer.yAtCer!=0
diff --git a/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def b/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
index c12c30fc97b737fdb0b3fc4ecc2f58f0085ce2ec..5d2e687835f107ba82d9aa1e827cf8470957eb5b 100644
--- a/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
@@ -85,15 +85,15 @@ TH1F phodo_beta 'SHMS Hodo Beta; Beta; Number of Entries / 0.015' P.hod.beta 100
TH1F phodo_fpHitsTime 'SHMS Hodo Focal Plane Time; Focal Plane Time (ns); Number of Entries / 1 ns' P.hod.fpHitsTime 90 0 90
TH1F phodo_starttime 'SHMS Hodo Start Time; Start Time (ns); Number of Entries / 1ns' P.hod.starttime 90 0 90
TH1F phodo_good_startime 'SHMS Hodo Good Start Flag; Good Start Flag (=1 is good); Number of Entries' P.hod.goodstarttime 5 0 5
-TH1F phodo_1x_fptime 'SHMS 1x fptime' P.hod.1x.fptime 100 0. 50. P.dc.ntrack>0
-TH1F phodo_1y_fptime 'SHMS 1y fptime' P.hod.1y.fptime 100 0. 50. P.dc.ntrack>0
-TH1F phodo_2x_fptime 'SHMS 2x fptime' P.hod.2x.fptime 100 0. 50. P.dc.ntrack>0
-TH1F phodo_2y_fptime 'SHMS 2y fptime' P.hod.2y.fptime 100 0. 50. P.dc.ntrack>0
-TH1F phodo_1x_diffdistrack 'SHMS Hodo Diff Distance track (cm)' P.hod.1x.DiffDisTrack 100 -10. 10.
-TH1F phodo_1y_diffdistrack 'SHMS Hodo Diff Distance track (cm)' P.hod.1y.DiffDisTrack 100 -10. 10.
-TH1F phodo_2x_diffdistrack 'SHMS Hodo Diff Distance track (cm)' P.hod.2x.DiffDisTrack 100 -10. 10.
-TH1F phodo_2y_diffdistrack 'SHMS Hodo Diff Distance track (cm)' P.hod.2y.DiffDisTrack 100 -10. 10.
-TH2F phodo_1x_diffdistrack_v_xtrack 'SHMS Hodo Diff Distance track (cm) versus Track X (cm)' P.hod.1x.DiffDisTrack P.hod.1x.TrackXPos 100 -10. 10. 240 -60 60
-TH2F phodo_1y_diffdistrack_v_ytrack 'SHMS Hodo Diff Distance track (cm) versus Track Y (cm)' P.hod.1y.DiffDisTrack P.hod.1y.TrackYPos 100 -10. 10. 240 -60 60
-TH2F phodo_2x_diffdistrack_v_xtrack 'SHMS Hodo Diff Distance track (cm) versus Track X (cm)' P.hod.2x.DiffDisTrack P.hod.2x.TrackXPos 100 -10. 10. 240 -60 60
-TH2F phodo_2y_diffdistrack_v_ytrack 'SHMS Hodo Diff Distance track (cm) versus Track Y (cm)' P.hod.2y.DiffDisTrack P.hod.2y.TrackXPos 100 -10. 10. 240 -60 60
\ No newline at end of file
+# TH1F phodo_1x_fptime 'SHMS 1x fptime' P.hod.1x.fptime 100 0. 50. P.dc.ntrack>0
+# TH1F phodo_1y_fptime 'SHMS 1y fptime' P.hod.1y.fptime 100 0. 50. P.dc.ntrack>0
+# TH1F phodo_2x_fptime 'SHMS 2x fptime' P.hod.2x.fptime 100 0. 50. P.dc.ntrack>0
+# TH1F phodo_2y_fptime 'SHMS 2y fptime' P.hod.2y.fptime 100 0. 50. P.dc.ntrack>0
+# TH1F phodo_1x_diffdistrack 'SHMS Hodo Diff Distance track (cm)' P.hod.1x.DiffDisTrack 100 -10. 10.
+# TH1F phodo_1y_diffdistrack 'SHMS Hodo Diff Distance track (cm)' P.hod.1y.DiffDisTrack 100 -10. 10.
+# TH1F phodo_2x_diffdistrack 'SHMS Hodo Diff Distance track (cm)' P.hod.2x.DiffDisTrack 100 -10. 10.
+# TH1F phodo_2y_diffdistrack 'SHMS Hodo Diff Distance track (cm)' P.hod.2y.DiffDisTrack 100 -10. 10.
+# TH2F phodo_1x_diffdistrack_v_xtrack 'SHMS Hodo Diff Distance track (cm) versus Track X (cm)' P.hod.1x.DiffDisTrack P.hod.1x.TrackXPos 100 -10. 10. 240 -60 60
+# TH2F phodo_1y_diffdistrack_v_ytrack 'SHMS Hodo Diff Distance track (cm) versus Track Y (cm)' P.hod.1y.DiffDisTrack P.hod.1y.TrackYPos 100 -10. 10. 240 -60 60
+# TH2F phodo_2x_diffdistrack_v_xtrack 'SHMS Hodo Diff Distance track (cm) versus Track X (cm)' P.hod.2x.DiffDisTrack P.hod.2x.TrackXPos 100 -10. 10. 240 -60 60
+# TH2F phodo_2y_diffdistrack_v_ytrack 'SHMS Hodo Diff Distance track (cm) versus Track Y (cm)' P.hod.2y.DiffDisTrack P.hod.2y.TrackXPos 100 -10. 10. 240 -60 60
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def b/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def
index 74db7635268aa1872dc2c5121b11a0e34a2aace2..20d2299dd59cbf35095961c4894300411d9c6c73 100644
--- a/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def
@@ -4,76 +4,76 @@
# TOTAL ENERGY AND NORMALIZED ENERGY DEPOSITED IN CALORIMETER (SHOWER AND PRE-SHOWER)
#-------------------------------------------------------------------------------------
-TH1F pcal_etrack 'SHMS Calorimeter Total Track Energy; Track Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.etrack 1000 0 10 P.cal.etrack>0.0
-TH1F pcal_etracknorm 'SHMS Calorimeter Normalized Track Energy; Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.001 ' P.cal.etracknorm 2000 0 2 P.cal.etracknorm>0.0
-TH1F pcal_etracknorm_track 'SHMS Calorimeter Normalized Track Energy (Ntrack > 0); Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.001 ' P.cal.etracknorm 2000 0 2 P.cal.etracknorm>0.0&&P.dc.ntrack>0
-TH1F pcal_etracknorm_track_elec 'SHMS Cal E/p Elec (npeSum>.5 && abs(del)<8); E/p; Entries / 0.001' P.cal.etracknorm 2000 0. 2 P.dc.ntrack>0&&P.ngcer.npeSum>.5&&P.hgcer.npeSum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH1F pcal_etracknorm_track_pion 'SHMS Cal E/p Pion (npeSum<.5 && abs(del)<8); E/p; Entries / 0.001' P.cal.etracknorm 2000 0. 2 P.dc.ntrack>0&&P.ngcer.npeSum<.5&&P.hgcer.npeSum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH1F pcal_etrack_track_elec 'SHMS Cal Electron Energy (npeSum>.5 && abs(del)<8); etrack; Entries / 0.01 GeV' P.cal.etrack 1000 0. 10 P.dc.ntrack>0&&P.ngcer.npeSum>.5&&P.hgcer.npeSum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH1F pcal_etrack_track_pion 'SHMS Cal Pion Energy (npeSum<.5 && abs(del)<8); etrack; Entries / 0.01 GeV' P.cal.etrack 1000 0. 10 P.dc.ntrack>0&&P.ngcer.npeSum<.5&&P.hgcer.npeSum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH2F pcal_etot_etrack 'SHMS Cal energy vs. track energy; Track Energy Deposition (GeV) / 0.01 GeV; Total Energy (GeV) / 0.01 GeV' P.cal.etrack P.cal.etot 1000 0. 10. 1000 0. 10. P.dc.ntrack>0
-TH2F pcal_ngnpe_etracknorm 'SHMS NG Cer Npe vs. Cal E/p; Normalized Track Energy Deposition / 0.001; ngcer NPE / 0.025 NPE' P.cal.etracknorm P.ngcer.npeSum 2000 0. 2 60 0. 15. P.dc.ntrack>0
+# TH1F pcal_etrack 'SHMS Calorimeter Total Track Energy; Track Energy Deposition (GeV); Number of Entries / 0.01 GeV' P.cal.etrack 1000 0 10 P.cal.etrack>0.0
+# TH1F pcal_etracknorm 'SHMS Calorimeter Normalized Track Energy; Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.001 ' P.cal.etracknorm 2000 0 2 P.cal.etracknorm>0.0
+# TH1F pcal_etracknorm_track 'SHMS Calorimeter Normalized Track Energy (Ntrack > 0); Trk. Energy Dep. (GeV) / Trk. P (GeV); Number of Entries / 0.001 ' P.cal.etracknorm 2000 0 2 P.cal.etracknorm>0.0&&P.dc.ntrack>0
+# TH1F pcal_etracknorm_track_elec 'SHMS Cal E/p Elec (npeSum>.5 && abs(del)<8); E/p; Entries / 0.001' P.cal.etracknorm 2000 0. 2 P.dc.ntrack>0&&P.ngcer.npeSum>.5&&P.hgcer.npeSum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
+# TH1F pcal_etracknorm_track_pion 'SHMS Cal E/p Pion (npeSum<.5 && abs(del)<8); E/p; Entries / 0.001' P.cal.etracknorm 2000 0. 2 P.dc.ntrack>0&&P.ngcer.npeSum<.5&&P.hgcer.npeSum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
+# TH1F pcal_etrack_track_elec 'SHMS Cal Electron Energy (npeSum>.5 && abs(del)<8); etrack; Entries / 0.01 GeV' P.cal.etrack 1000 0. 10 P.dc.ntrack>0&&P.ngcer.npeSum>.5&&P.hgcer.npeSum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
+# TH1F pcal_etrack_track_pion 'SHMS Cal Pion Energy (npeSum<.5 && abs(del)<8); etrack; Entries / 0.01 GeV' P.cal.etrack 1000 0. 10 P.dc.ntrack>0&&P.ngcer.npeSum<.5&&P.hgcer.npeSum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
+# TH2F pcal_etot_etrack 'SHMS Cal energy vs. track energy; Track Energy Deposition (GeV) / 0.01 GeV; Total Energy (GeV) / 0.01 GeV' P.cal.etrack P.cal.etot 1000 0. 10. 1000 0. 10. P.dc.ntrack>0
+# TH2F pcal_ngnpe_etracknorm 'SHMS NG Cer Npe vs. Cal E/p; Normalized Track Energy Deposition / 0.001; ngcer NPE / 0.025 NPE' P.cal.etracknorm P.ngcer.npeSum 2000 0. 2 60 0. 15. P.dc.ntrack>0
TH2F pcal_hgnpe_etracknorm 'SHMS HG Cer Npe vs. Cal E/p; Normalized Track Energy Deposition / 0.001; hgcer NPE / 0.025 NPE' P.cal.etracknorm P.hgcer.npeSum 2000 0. 2 60 0. 15. P.dc.ntrack>0
#---------------------------
# CLUSTERING PLOTS
#---------------------------
-TH1F pcal_xclusttrack 'SHMS Cal Cluster X Pos; Cluster X (cm); Entries / 1 cm' P.cal.xclusttrack 200 -100. 100. P.cal.nclusttrack>-1
-TH1F pcal_xdiff 'SHMS Cal Cluster X - Track X; Cluster X - Track X (cm); Entries / 0.2 cm' P.cal.xclusttrack-P.cal.xtrack 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH2F pcal_xdiff_v_xtr 'SHMS Cal (Cluster X- Track X) vs. (Track X); Track X (cm) / 0.2 cm; Cluster X - Track X (cm) / 0.2 cm' P.cal.xtrack P.cal.xclusttrack-P.cal.xtrack 1000 -100. 100. 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH1F pcal_xtrack 'SHMS Cal Track X; Track X (cm); Entries / 0.2 cm' P.cal.xtrack 1000 -100. 100. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH1F pcal_xtrack1 'SHMS Cal Track x pos with no matching clust; Track X (cm); Entries / 0.2 cm' P.cal.xtrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
-TH1F pcal_xtrack2 'SHMS Cal Track x pos with no matching clust number of cluster=1; Track X (cm); Entries / 0.2 cm' P.cal.xtrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
-TH1F pcal_yclusttrack 'SHMS Cal Cluster y Pos; Cluster y (cm); Entries / 1 cm' P.cal.yclusttrack 200 -100. 100. P.cal.nclusttrack>-1
-TH1F pcal_ydiff 'SHMS Cal Cluster y - Track y; Cluster y - Track y (cm); Entries / 0.2 cm' P.cal.yclusttrack-P.cal.ytrack 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH2F pcal_ydiff_v_ytr 'SHMS Cal (Cluster y - Track y) vs. (Track y); Track y (cm) / 0.2 cm; Cluster y - Track y (cm) / 0.2 cm' P.cal.ytrack P.cal.yclusttrack-P.cal.ytrack 1000 -100. 100. 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH1F pcal_ytrack 'SHMS Cal Track y; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH1F pcal_ytrack1 'SHMS Cal Track y pos with no matching clust; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
-TH1F pcal_ytrack2 'SHMS Cal Track y pos with no matching clust number of cluster=1; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
+# TH1F pcal_xclusttrack 'SHMS Cal Cluster X Pos; Cluster X (cm); Entries / 1 cm' P.cal.xclusttrack 200 -100. 100. P.cal.nclusttrack>-1
+# TH1F pcal_xdiff 'SHMS Cal Cluster X - Track X; Cluster X - Track X (cm); Entries / 0.2 cm' P.cal.xclusttrack-P.cal.xtrack 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+# TH2F pcal_xdiff_v_xtr 'SHMS Cal (Cluster X- Track X) vs. (Track X); Track X (cm) / 0.2 cm; Cluster X - Track X (cm) / 0.2 cm' P.cal.xtrack P.cal.xclusttrack-P.cal.xtrack 1000 -100. 100. 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+# TH1F pcal_xtrack 'SHMS Cal Track X; Track X (cm); Entries / 0.2 cm' P.cal.xtrack 1000 -100. 100. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+# TH1F pcal_xtrack1 'SHMS Cal Track x pos with no matching clust; Track X (cm); Entries / 0.2 cm' P.cal.xtrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
+# TH1F pcal_xtrack2 'SHMS Cal Track x pos with no matching clust number of cluster=1; Track X (cm); Entries / 0.2 cm' P.cal.xtrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
+# TH1F pcal_yclusttrack 'SHMS Cal Cluster y Pos; Cluster y (cm); Entries / 1 cm' P.cal.yclusttrack 200 -100. 100. P.cal.nclusttrack>-1
+# TH1F pcal_ydiff 'SHMS Cal Cluster y - Track y; Cluster y - Track y (cm); Entries / 0.2 cm' P.cal.yclusttrack-P.cal.ytrack 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+# TH2F pcal_ydiff_v_ytr 'SHMS Cal (Cluster y - Track y) vs. (Track y); Track y (cm) / 0.2 cm; Cluster y - Track y (cm) / 0.2 cm' P.cal.ytrack P.cal.yclusttrack-P.cal.ytrack 1000 -100. 100. 200 -50. 50. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+# TH1F pcal_ytrack 'SHMS Cal Track y; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+# TH1F pcal_ytrack1 'SHMS Cal Track y pos with no matching clust; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
+# TH1F pcal_ytrack2 'SHMS Cal Track y pos with no matching clust number of cluster=1; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
-TH2F pcal_xytrack 'SHMS Cal Track X vs Track Y; Track Y / 1 cm; Track X / 1 cm' P.cal.ytrack P.cal.xtrack 200 -100 100 200 -100 100 P.dc.ntrack>0
-TH2F pcal_xyclusttrack 'SHMS Cal Cluster X vs Cluster Y; Cluster Y / 1 cm; Cluster X / 1 cm' P.cal.yclusttrack P.cal.xclusttrack 200 -100 100 200 -100 100 P.cal.nclusttrack>-1&&P.dc.ntrack>0
+# TH2F pcal_xytrack 'SHMS Cal Track X vs Track Y; Track Y / 1 cm; Track X / 1 cm' P.cal.ytrack P.cal.xtrack 200 -100 100 200 -100 100 P.dc.ntrack>0
+# TH2F pcal_xyclusttrack 'SHMS Cal Cluster X vs Cluster Y; Cluster Y / 1 cm; Cluster X / 1 cm' P.cal.yclusttrack P.cal.xclusttrack 200 -100 100 200 -100 100 P.cal.nclusttrack>-1&&P.dc.ntrack>0
-TH2F pcal_xtrack_vs_etrack 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pcut_CleanTrack
-TH2F pcal_ytrack_vs_etrack 'SHMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pcut_CleanTrack
-TH2F pcal_xtrack_vs_etracknorm 'SHMS Calorimeter xtrack vs total track energy; Normalized Track Energy Deposition (Gev) / 0.025; X Track (cm) / 1 cm' P.cal.etracknorm P.cal.xtrack 60 0 1.5 120 -60 60 pcut_CleanTrack
-TH2F pcal_ytrack_vs_etracknorm 'SHMS Calorimeter ytrack vs total track energy; Normalized Track Energy Deposition (Gev) / 0.025; Y Track (cm) / 1 cm' P.cal.etracknorm P.cal.ytrack 60 0 1.5 100 -50 50 pcut_CleanTrack
-TH2F pcal_xtrack_vs_etrack_elec 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
-TH2F pcal_ytrack_vs_etrack_elec 'SHMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
-TH2F pcal_xtrack_vs_etrack_pi 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
-TH2F pcal_ytrack_vs_etrack_pi 'SHMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
+# TH2F pcal_xtrack_vs_etrack 'SHMS Calorimeter X-Track vs Total Track Energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pcut_CleanTrack
+# TH2F pcal_ytrack_vs_etrack 'SHMS Calorimeter Y-Track vs Total Track Energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pcut_CleanTrack
+TH2F pcal_xtrack_vs_etracknorm 'SHMS Calorimeter X-Track vs Total Track Energy; Normalized Track Energy Deposition (Gev) / 0.025; X Track (cm) / 1 cm' P.cal.etottracknorm P.cal.xtrack 60 0 1.5 120 -60 60 pcut_CleanTrack
+TH2F pcal_ytrack_vs_etracknorm 'SHMS Calorimeter Y-Track vs Total Track Energy; Normalized Track Energy Deposition (Gev) / 0.025; Y Track (cm) / 1 cm' P.cal.etottracknorm P.cal.ytrack 60 0 1.5 100 -50 50 pcut_CleanTrack
+# TH2F pcal_xtrack_vs_etrack_elec 'SHMS Calorimeter X-Track vs Total Track Energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+# TH2F pcal_ytrack_vs_etrack_elec 'SHMS Calorimeter Y-Track vs Total Track Energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+# TH2F pcal_xtrack_vs_etrack_pi 'SHMS Calorimeter X-Track vs Total Track Energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
+# TH2F pcal_ytrack_vs_etrack_pi 'SHMS Calorimeter Y-Track vs Total Track Energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
#-------------------------------
# SHMS PID AND ACCEPTANCE PLOTS
#-------------------------------
TH2F hgc_vs_prshw 'SHMS HGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC NPE Sum / 0.5' P.cal.pr.eplane P.hgcer.npeSum 400 0 4 80 0 40 P.cal.pr.eplane>0.0&&P.hgcer.npeSum>0.0
-TH2F hgc_vs_prshw_elec 'SHMS Electron HGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC NPE Sum / 0.5' P.cal.pr.eplane P.hgcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
-TH2F hgc_vs_prshw_pi 'SHMS Pion HGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC NPE Sum / 0.5' P.cal.pr.eplane P.hgcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
+# TH2F hgc_vs_prshw_elec 'SHMS Electron HGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC NPE Sum / 0.5' P.cal.pr.eplane P.hgcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+# TH2F hgc_vs_prshw_pi 'SHMS Pion HGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; HGC NPE Sum / 0.5' P.cal.pr.eplane P.hgcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
TH2F ngc_vs_prshw 'SHMS NGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC NPE Sum / 0.5' P.cal.pr.eplane P.ngcer.npeSum 400 0 4 80 0 40 P.cal.pr.eplane>0.0&&P.ngcer.npeSum>0.0
-TH2F ngc_vs_prshw_elec 'SHMS Electron NGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC NPE Sum / 0.5' P.cal.pr.eplane P.ngcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
-TH2F ngc_vs_prshw_pi 'SHMS Pion NGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC NPE Sum / 0.5' P.cal.pr.eplane P.ngcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
+# TH2F ngc_vs_prshw_elec 'SHMS Electron NGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC NPE Sum / 0.5' P.cal.pr.eplane P.ngcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+# TH2F ngc_vs_prshw_pi 'SHMS Pion NGC NPE Sum vs. PreSh Energy; Total PreSh Energy Deposition / 0.01 GeV; NGC NPE Sum / 0.5' P.cal.pr.eplane P.ngcer.npeSum 400 0 4 80 0 40 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
TH2F pcal_shw_vs_prshw 'SHMS Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' P.cal.pr.eplane P.cal.fly.earray 400 0 4 1200 0 12 P.cal.pr.eplane>0.0&&P.cal.fly.earray>0.0
-TH2F pcal_shw_vs_prshw_elec 'SHMS Electron Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' P.cal.pr.eplane P.cal.fly.earray 400 0 4 1200 0 12 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
-TH2F pcal_shw_vs_prshw_pi 'SHMS Pion Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' P.cal.pr.eplane P.cal.fly.earray 400 0 4 1200 0 12 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
+# TH2F pcal_shw_vs_prshw_elec 'SHMS Electron Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' P.cal.pr.eplane P.cal.fly.earray 400 0 4 1200 0 12 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+# TH2F pcal_shw_vs_prshw_pi 'SHMS Pion Shower vs. PreShower Energy Deposition; PreShower Energy / 0.01 GeV; Shower Energy / 0.01 GeV' P.cal.pr.eplane P.cal.fly.earray 400 0 4 1200 0 12 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
TH2F pcal_delta_etracknorm 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 152 -25. 13. pcut_CleanTrack
-TH2F pcal_delta_etracknorm_elec 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 152 -25. 13. pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
-TH2F pcal_delta_etracknorm_pi 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 152 -25. 13. pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
+# TH2F pcal_delta_etracknorm_elec 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 152 -25. 13. pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+# TH2F pcal_delta_etracknorm_pi 'SHMS Delta vs. Cal E/p; Normalized Track Energy Deposition / 0.025; Delta / 0.25' P.cal.etracknorm P.gtr.dp 60 0. 1.5 152 -25. 13. pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
-TH2F pcal_prshwr_good_dtime_vs_pmt_pos 'SHMS PreShower+ Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Good Hodo Start - Pulse Time / 0.1 ns' [I+1] P.cal.pr.goodPosAdcPulseTime 14 0.5 14.5 4000 -200 200
-TH2F pcal_prshwr_good_dtime_vs_pmt_neg 'SHMS PreShower- Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Good Hodo Start - Pulse Time / 0.1 ns' [I+1] P.cal.pr.goodNegAdcTdcDiffTime 14 0.5 14.5 4000 -200 200
-TH2F pcal_shwr_good_dtime_vs_pmt 'SHMS Shower Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Good Hodo Start - Pulse Time / 0.1 ns' [I+1] P.cal.fly.goodAdcPulseTime 224 0.5 224.5 4000 -200 200
+# TH2F pcal_prshwr_good_dtime_vs_pmt_pos 'SHMS PreShower+ Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Good Hodo Start - Pulse Time / 0.1 ns' [I+1] P.cal.pr.goodPosAdcPulseTime 14 0.5 14.5 4000 -200 200
+# TH2F pcal_prshwr_good_dtime_vs_pmt_neg 'SHMS PreShower- Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Good Hodo Start - Pulse Time / 0.1 ns' [I+1] P.cal.pr.goodNegAdcTdcDiffTime 14 0.5 14.5 4000 -200 200
+# TH2F pcal_shwr_good_dtime_vs_pmt 'SHMS Shower Good Hodo Start - Pulse Time vs. PMT Number; PMT Number; Good Hodo Start - Pulse Time / 0.1 ns' [I+1] P.cal.fly.goodAdcPulseTime 224 0.5 224.5 4000 -200 200
#-----------------------------
# SHMS Drift Chambers PID Cuts
#-----------------------------
-TH1F pdc_trk_beta_elec 'SHMS DC ElectronTrack Beta; Beta; Number of Entires' P.tr.beta 300 -1.5 1.5 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
-TH1F pdc_trk_beta_pi 'SHMS DC Pion Track Beta; Beta; Number of Entires' P.tr.beta 300 -1.5 1.5 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
+# TH1F pdc_trk_beta_elec 'SHMS DC ElectronTrack Beta; Beta; Number of Entires' P.tr.beta 300 -1.5 1.5 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+# TH1F pdc_trk_beta_pi 'SHMS DC Pion Track Beta; Beta; Number of Entires' P.tr.beta 300 -1.5 1.5 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
-TH1F pdc_trk_mom_elec 'SHMS DC Electron Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
-TH1F pdc_trk_mom_pi 'SHMS DC Pion Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
\ No newline at end of file
+# TH1F pdc_trk_mom_elec 'SHMS DC Electron Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6 pcut_CleanTrack&&pcut_cer_hg_elec&&pcut_cal_elec
+# TH1F pdc_trk_mom_pi 'SHMS DC Pion Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6 pcut_CleanTrack&&pcut_cer_hg_pi&&pcut_cal_pi
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def b/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def
index 37f53cd8d664affa32e4dca18510e534aa3f2a41..b5a4d778042e0dbc6f96e97d922282d791c581e5 100644
--- a/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def
@@ -10,28 +10,28 @@ formula FRXBraw_V P.rb.raster.frxbRawAdc*(1./4096.)/25.
formula FRYAraw_V P.rb.raster.fryaRawAdc*(1./4096.)/25.
formula FRYBraw_V P.rb.raster.frybRawAdc*(1./4096.)/25.
-TH1F pFRXAraw 'SHMS FRXA Raw; FRXA RAW ADC (chan); Counts' P.rb.raster.frxaRawAdc 100 0 100000 P.dc.ntrack>0
-TH1F pFRXAraw_V 'SHMS FRXA Raw; FRXA RAW ADC (Volts); Counts' FRXAraw_V 100 0 1.0 P.dc.ntrack>0
-TH1F pFRYAraw 'SHMS FRYA Raw; FRYA RAW ADC (chan); Counts' P.rb.raster.fryaRawAdc 100 0 100000 P.dc.ntrack>0
-TH1F pFRYAraw_V 'SHMS FRYA Raw; FRYA RAW ADC (Volts); Counts' FRYAraw_V 100 0 1.0 P.dc.ntrack>0
-
-TH1F pFRXBraw 'SHMS FRXB Raw; FRXB RAW ADC (chan); Counts' P.rb.raster.frxbRawAdc 100 0 100000 P.dc.ntrack>0
-TH1F pFRXBraw_V 'SHMS FRXB Raw; FRXB RAW ADC (Volts); Counts' FRXBraw_V 100 0 1.0 P.dc.ntrack>0
-TH1F pFRYBraw 'SHMS FRYB Raw; FRYB RAW ADC (chan); Counts' P.rb.raster.frybRawAdc 100 0 100000 P.dc.ntrack>0
-TH1F pFRYBraw_V 'SHMS FRYB Raw; FRYB RAW ADC (Volts); Counts' FRYBraw_V 100 0 1.0 P.dc.ntrack>0
-
-TH1F pFRXA 'SHMS FRXA; FRXA ADC (chan); Counts' P.rb.raster.frxa_adc 100 -50000 50000 P.dc.ntrack>0
-TH1F pFRXB 'SHMS FRXB; FRXB ADC (chan); Counts' P.rb.raster.frxb_adc 100 -50000 50000 P.dc.ntrack>0
-TH1F pFRYA 'SHMS FRYA; FRYA ADC (chan); Counts' P.rb.raster.frya_adc 100 -50000 50000 P.dc.ntrack>0
-TH1F pFRYB 'SHMS FRYB; FRYB ADC (chan); Counts' P.rb.raster.fryb_adc 100 -50000 50000 P.dc.ntrack>0
-
-TH1F pFRXApos 'SHMS FRXApos; FRXA POS (CM); Counts' P.rb.raster.fr_xa 100 -0.5 0.5 P.dc.ntrack>0
-TH1F pFRXBpos 'SHMS FRXBpos; FRXB POS (CM); Counts' P.rb.raster.fr_xb 100 -0.5 0.5 P.dc.ntrack>0
-TH1F pFRYApos 'SHMS FRYApos; FRYA POS (CM); Counts' P.rb.raster.fr_ya 100 -0.5 0.5 P.dc.ntrack>0
-TH1F pFRYBpos 'SHMS FRYBpos; FRYB POS (CM); Counts' P.rb.raster.fr_yb 100 -0.5 0.5 P.dc.ntrack>0
-
-TH2F pFRAraw_XvsY 'SHMS FRA Raw X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXAraw_V FRYAraw_V 100 0 1.0 100 0 1.0 P.dc.ntrack>0
-TH2F pFRBraw_XvsY 'SHMS FRB Raw X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXBraw_V FRYBraw_V 100 0 1.0 100 0 1.0 P.dc.ntrack>0
+# TH1F pFRXAraw 'SHMS FRXA Raw; FRXA RAW ADC (chan); Counts' P.rb.raster.frxaRawAdc 100 0 100000 P.dc.ntrack>0
+# TH1F pFRXAraw_V 'SHMS FRXA Raw; FRXA RAW ADC (Volts); Counts' FRXAraw_V 100 0 1.0 P.dc.ntrack>0
+# TH1F pFRYAraw 'SHMS FRYA Raw; FRYA RAW ADC (chan); Counts' P.rb.raster.fryaRawAdc 100 0 100000 P.dc.ntrack>0
+# TH1F pFRYAraw_V 'SHMS FRYA Raw; FRYA RAW ADC (Volts); Counts' FRYAraw_V 100 0 1.0 P.dc.ntrack>0
+
+# TH1F pFRXBraw 'SHMS FRXB Raw; FRXB RAW ADC (chan); Counts' P.rb.raster.frxbRawAdc 100 0 100000 P.dc.ntrack>0
+# TH1F pFRXBraw_V 'SHMS FRXB Raw; FRXB RAW ADC (Volts); Counts' FRXBraw_V 100 0 1.0 P.dc.ntrack>0
+# TH1F pFRYBraw 'SHMS FRYB Raw; FRYB RAW ADC (chan); Counts' P.rb.raster.frybRawAdc 100 0 100000 P.dc.ntrack>0
+# TH1F pFRYBraw_V 'SHMS FRYB Raw; FRYB RAW ADC (Volts); Counts' FRYBraw_V 100 0 1.0 P.dc.ntrack>0
+
+# TH1F pFRXA 'SHMS FRXA; FRXA ADC (chan); Counts' P.rb.raster.frxa_adc 100 -50000 50000 P.dc.ntrack>0
+# TH1F pFRXB 'SHMS FRXB; FRXB ADC (chan); Counts' P.rb.raster.frxb_adc 100 -50000 50000 P.dc.ntrack>0
+# TH1F pFRYA 'SHMS FRYA; FRYA ADC (chan); Counts' P.rb.raster.frya_adc 100 -50000 50000 P.dc.ntrack>0
+# TH1F pFRYB 'SHMS FRYB; FRYB ADC (chan); Counts' P.rb.raster.fryb_adc 100 -50000 50000 P.dc.ntrack>0
+
+# TH1F pFRXApos 'SHMS FRXApos; FRXA POS (CM); Counts' P.rb.raster.fr_xa 100 -0.5 0.5 P.dc.ntrack>0
+# TH1F pFRXBpos 'SHMS FRXBpos; FRXB POS (CM); Counts' P.rb.raster.fr_xb 100 -0.5 0.5 P.dc.ntrack>0
+# TH1F pFRYApos 'SHMS FRYApos; FRYA POS (CM); Counts' P.rb.raster.fr_ya 100 -0.5 0.5 P.dc.ntrack>0
+# TH1F pFRYBpos 'SHMS FRYBpos; FRYB POS (CM); Counts' P.rb.raster.fr_yb 100 -0.5 0.5 P.dc.ntrack>0
+
+# TH2F pFRAraw_XvsY 'SHMS FRA Raw X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXAraw_V FRYAraw_V 100 0 1.0 100 0 1.0 P.dc.ntrack>0
+# TH2F pFRBraw_XvsY 'SHMS FRB Raw X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXBraw_V FRYBraw_V 100 0 1.0 100 0 1.0 P.dc.ntrack>0
TH2F pFRApos_XvsY 'SHMS FRA X vs Y; FRA X Position (cm); FRA Y Position (cm)' P.rb.raster.fr_xa P.rb.raster.fr_ya 40 -0.2 0.2 40 -0.2 0.2 P.dc.ntrack>0
TH2F pFRBpos_XvsY 'SHMS FRB X vs Y; FRB X Position (cm); FRB Y Position (cm)' P.rb.raster.fr_xb P.rb.raster.fr_yb 40 -0.2 0.2 40 -0.2 0.2 P.dc.ntrack>0
diff --git a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
index 1f841b3edddf340ac3fd1a61eaf714d07c24783b..420296627397e00d6aca40a0b9c0e20bd2974533 100644
--- a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
@@ -26,8 +26,8 @@ TH1F ptrig_p1y_good_tdc 'SHMS p1y Good TDC Time; Good TDC Time (ns); Counts / 1
TH1F ptrig_p2x_good_tdc 'SHMS p2x Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.shms.p2X_tdcTime 800 0 800
TH1F ptrig_p2y_good_tdc 'SHMS p2y Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.shms.p2Y_tdcTime 800 0 800
-TH1F ptrig_p1T_good_tdc 'SHMS p1x/p1y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.shms.p1T_tdcTime 800 0 800
-TH1F ptrig_p2T_good_tdc 'SHMS p2x/p2y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.shms.p2T_tdcTime 800 0 800
+# TH1F ptrig_p1T_good_tdc 'SHMS p1x/p1y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.shms.p1T_tdcTime 800 0 800
+# TH1F ptrig_p2T_good_tdc 'SHMS p2x/p2y Coincidence Good TDC Time; Good TDC Time (ns); Counts / 1 ns' T.shms.p2T_tdcTime 800 0 800
TH1F ptrig_pT1_good_tdc 'SHMS pT1 Good TDC Time (Slot 20, Channel 15); Good TDC Time (ns); Counts / 1 ns' T.shms.pT1_tdcTime 800 0 800
TH1F ptrig_pT2_good_tdc 'SHMS pT2 Good TDC Time (Slot 19, Channel 31); Good TDC Time (ns); Counts / 1 ns' T.shms.pT2_tdcTime 800 0 800
@@ -35,22 +35,22 @@ TH1F ptrig_pT3_good_tdc 'SHMS pT3 Good TDC Time (Slot 19, Channel 38); Good TDC
TH1F ptrig_pFADC_TREF_ROC2_good_tdc 'SHMS pFADC_TREF_ROC2 Good Pulse Time; Good Pulse Time (ns); Counts / 1 ns' T.shms.pFADC_TREF_ROC2_adcPulseTime 800 0 800
-TH2F ptrig_ch1xy_ch2x 'SHMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.shms.p1T_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300
-TH2F ptrig_ch1x_ch2x 'SHMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)' T.shms.p1X_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300
-TH2F ptrig_ch1y_ch2x 'SHMS Hodo Trig; 1Y Trig (ns); 2X Trig (ns)' T.shms.p1Y_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300
-TH2F ptrig_ch1y_ch1x 'SHMS Hodo Trig; 1X Trig (ns); 1Y Trig (ns)' T.shms.p1X_tdcTime T.shms.p1Y_tdcTime 200 100 300 200 100 300
+# TH2F ptrig_ch1xy_ch2x 'SHMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.shms.p1T_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300
+# TH2F ptrig_ch1x_ch2x 'SHMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)' T.shms.p1X_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300
+# TH2F ptrig_ch1y_ch2x 'SHMS Hodo Trig; 1Y Trig (ns); 2X Trig (ns)' T.shms.p1Y_tdcTime T.shms.p2X_tdcTime 200 100 300 200 100 300
+# TH2F ptrig_ch1y_ch1x 'SHMS Hodo Trig; 1X Trig (ns); 1Y Trig (ns)' T.shms.p1X_tdcTime T.shms.p1Y_tdcTime 200 100 300 200 100 300
-TH1F ptrig_p1x_tdc_mult 'SHMS p1x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1X_tdcMultiplicity 11 0 11
-TH1F ptrig_p1y_tdc_mult 'SHMS p1y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1Y_tdcMultiplicity 11 0 11
-TH1F ptrig_p2x_tdc_mult 'SHMS p2x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2X_tdcMultiplicity 11 0 11
-TH1F ptrig_p2y_tdc_mult 'SHMS p2y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2Y_tdcMultiplicity 11 0 11
+# TH1F ptrig_p1x_tdc_mult 'SHMS p1x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1X_tdcMultiplicity 11 0 11
+# TH1F ptrig_p1y_tdc_mult 'SHMS p1y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1Y_tdcMultiplicity 11 0 11
+# TH1F ptrig_p2x_tdc_mult 'SHMS p2x TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2X_tdcMultiplicity 11 0 11
+# TH1F ptrig_p2y_tdc_mult 'SHMS p2y TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2Y_tdcMultiplicity 11 0 11
-TH1F ptrig_p1T_tdc_mult 'SHMS p1x/p1y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1T_tdcMultiplicity 11 0 11
-TH1F ptrig_p2T_tdc_mult 'SHMS p2x/p2y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2T_tdcMultiplicity 11 0 11
+# TH1F ptrig_p1T_tdc_mult 'SHMS p1x/p1y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p1T_tdcMultiplicity 11 0 11
+# TH1F ptrig_p2T_tdc_mult 'SHMS p2x/p2y Coincidence TDC Multiplicity; TDC Multiplicity; Counts / 1' T.shms.p2T_tdcMultiplicity 11 0 11
-TH1F ptrig_pT1_tdc_mult 'SHMS pT1 TDC Multiplicity (Slot 20, Channel 15); TDC Multiplicity; Counts / 1' T.shms.pT1_tdcMultiplicity 11 0 11
-TH1F ptrig_pT2_tdc_mult 'SHMS pT2 TDC Multiplicity (Slot 19, Channel 31); TDC Multiplicity; Counts / 1' T.shms.pT2_tdcMultiplicity 11 0 11
-TH1F ptrig_pT3_tdc_mult 'SHMS pT3 TDC Multiplicity (Slot 19, Channel 38); TDC Multiplicity; Counts / 1' T.shms.pT3_tdcMultiplicity 11 0 11
+# TH1F ptrig_pT1_tdc_mult 'SHMS pT1 TDC Multiplicity (Slot 20, Channel 15); TDC Multiplicity; Counts / 1' T.shms.pT1_tdcMultiplicity 11 0 11
+# TH1F ptrig_pT2_tdc_mult 'SHMS pT2 TDC Multiplicity (Slot 19, Channel 31); TDC Multiplicity; Counts / 1' T.shms.pT2_tdcMultiplicity 11 0 11
+# TH1F ptrig_pT3_tdc_mult 'SHMS pT3 TDC Multiplicity (Slot 19, Channel 38); TDC Multiplicity; Counts / 1' T.shms.pT3_tdcMultiplicity 11 0 11
TH1F ptrig_pFADC_TREF_ROC2_ptime_mult 'SHMS pFADC_TREF_ROC2 ADC Multiplicity; ADC Multiplicity; Counts / 1' T.shms.pFADC_TREF_ROC2_adcMultiplicity 11 0 11
@@ -58,11 +58,11 @@ TH1F ptrig_pFADC_TREF_ROC2_ptime_mult 'SHMS pFADC_TREF_ROC2 ADC Multiplicity; AD
# SHMS Trigger Rate vs. 1 Mhz Clock Time
#----------------------------------------
-TH2D ptrig1rate_vs_time 'SHMS Trig1 Rate vs. Time; 1 MHz Clock Time (s); pTRIG1 Rate (Hz)' P.1MHz.scalerTime P.pTRIG1.scalerRate 350 0 7000 500 0 200000
-TH2D ptrig2rate_vs_time 'SHMS Trig2 Rate vs. Time; 1 MHz Clock Time (s); pTRIG2 Rate (Hz)' P.1MHz.scalerTime P.pTRIG2.scalerRate 350 0 7000 500 0 200000
-TH2D ptrig3rate_vs_time 'SHMS Trig3 Rate vs. Time; 1 MHz Clock Time (s); pTRIG3 Rate (Hz)' P.1MHz.scalerTime P.pTRIG3.scalerRate 350 0 7000 500 0 200000
-TH2D ptrig4rate_vs_time 'SHMS Trig4 Rate vs. Time; 1 MHz Clock Time (s); pTRIG4 Rate (Hz)' P.1MHz.scalerTime P.pTRIG4.scalerRate 350 0 7000 500 0 200000
-TH2D ptrig6rate_vs_time 'SHMS Trig6 Rate vs. Time; 1 MHz Clock Time (s); pTRIG6 Rate (Hz)' P.1MHz.scalerTime P.pTRIG6.scalerRate 350 0 7000 500 0 200000
+# TH2D ptrig1rate_vs_time 'SHMS Trig1 Rate vs. Time; 1 MHz Clock Time (s); pTRIG1 Rate (Hz)' P.1MHz.scalerTime P.pTRIG1.scalerRate 350 0 7000 500 0 200000
+# TH2D ptrig2rate_vs_time 'SHMS Trig2 Rate vs. Time; 1 MHz Clock Time (s); pTRIG2 Rate (Hz)' P.1MHz.scalerTime P.pTRIG2.scalerRate 350 0 7000 500 0 200000
+# TH2D ptrig3rate_vs_time 'SHMS Trig3 Rate vs. Time; 1 MHz Clock Time (s); pTRIG3 Rate (Hz)' P.1MHz.scalerTime P.pTRIG3.scalerRate 350 0 7000 500 0 200000
+# TH2D ptrig4rate_vs_time 'SHMS Trig4 Rate vs. Time; 1 MHz Clock Time (s); pTRIG4 Rate (Hz)' P.1MHz.scalerTime P.pTRIG4.scalerRate 350 0 7000 500 0 200000
+# TH2D ptrig6rate_vs_time 'SHMS Trig6 Rate vs. Time; 1 MHz Clock Time (s); pTRIG6 Rate (Hz)' P.1MHz.scalerTime P.pTRIG6.scalerRate 350 0 7000 500 0 200000
#--------------------------------------------
#SHMS TRIG PEDESTALS for HGC, NGC, PRESHWR
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production.def b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
index 4c90f5ef277689dc7552c2b9c0b2d2cf505c9c0d..23bd7464c4b9cbaabb2e5ca10463e99072dc5edc 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
@@ -2,6 +2,7 @@
#include "DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def"
#include "DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def"
#include "DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/DC/pdc_eff_histos.def"
#include "DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def"
# #include "DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def"
#include "DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def"
diff --git a/MAPS/HMS/DETEC/STACK/hms_stack.map b/MAPS/HMS/DETEC/STACK/hms_stack.map
index 9c4dd11dba3ca48544563cc9cf12198b93bfd189..d8bf50010bdec62de7427ece7ed6cd2bfe68440b 100644
--- a/MAPS/HMS/DETEC/STACK/hms_stack.map
+++ b/MAPS/HMS/DETEC/STACK/hms_stack.map
@@ -57,6 +57,7 @@ REFINDEX=0
19, 2, 32, 1 ! pTRIG4
20, 2, 33, 1 ! pTRIG5
21, 2, 34, 1 ! pTRIG6
+ 47, 2, 47, 1 ! hT3
48, 2, 35, 1 ! pSTOF
49, 2, 36, 1 ! pEL_LO_LO
50, 2, 37, 1 ! pEL_LO
@@ -69,7 +70,6 @@ REFINDEX=0
59, 2, 44, 1 ! hEL_HI
60, 2, 45, 1 ! hEL_REAL
61, 2, 46, 1 ! hEL_CLEAN
- 63, 2, 47, 1 ! hT3
64, 2, 48, 1 ! pPRE40
65, 2, 49, 1 ! pPRE100
66, 2, 50, 1 ! pPRE150
diff --git a/MAPS/HMS/DETEC/TRIG/htrig.map b/MAPS/HMS/DETEC/TRIG/htrig.map
index 7990e94c03b4842625f806fa34bb4e29834e158a..89512b63177b7cd1b82e846bf9df496b8d7403d8 100644
--- a/MAPS/HMS/DETEC/TRIG/htrig.map
+++ b/MAPS/HMS/DETEC/TRIG/htrig.map
@@ -64,6 +64,7 @@ REFINDEX=0
20, 2, 33, 1 ! pTRIG5
21, 2, 34, 1 ! pTRIG6
! B1
+ 47, 2, 47, 1 ! hT3
48, 2, 35, 1 ! pSTOF
49, 2, 36, 1 ! pEL_LO_LO
50, 2, 37, 1 ! pEL_LO
@@ -76,7 +77,6 @@ REFINDEX=0
59, 2, 44, 1 ! hEL_HI
60, 2, 45, 1 ! hEL_REAL
61, 2, 46, 1 ! hEL_CLEAN
- 63, 2, 47, 1 ! hT3
! C0
64, 2, 48, 1 ! pPRE40
65, 2, 49, 1 ! pPRE100
diff --git a/PARAM/GEN/gscalers.param b/PARAM/GEN/gscalers.param
index 908ba18b181d80e41e8d6932ad9009a00803251c..9ef61053923ea094934a76bba472d38e827d39bc 100644
--- a/PARAM/GEN/gscalers.param
+++ b/PARAM/GEN/gscalers.param
@@ -1,7 +1,7 @@
gNumBCMs=6
-gBCM_Gain = 5048, 4321, 4166, 13650, 6496., 2154.
-gBCM_Offset = 250200, 250100, 393000, -2994.0, -1148.0, -154.3
-gBCM_Names = "BCM1 BCM2 Unser BCM4A BCM4C BCM4B"
+gBCM_Gain = 5713, 5528, 5020, 9279, 2102., 6343.
+gBCM_Offset = 253400, 250900, 325000, 762.6, 317.9, 852.4
+gBCM_Names = "BCM1 BCM2 Unser BCM4A BCM4B BCM4C"
gBCM_Current_threshold = 5.0
; index = 0 to gNumBCMs-1
gBCM_Current_threshold_index = 3
diff --git a/PARAM/HMS/BCM/CALIB/bcmcurrent_1437.param b/PARAM/HMS/BCM/CALIB/bcmcurrent_1437.param
deleted file mode 100644
index 262e50e0fce6a516b1acaae807d23f32d1487de6..0000000000000000000000000000000000000000
--- a/PARAM/HMS/BCM/CALIB/bcmcurrent_1437.param
+++ /dev/null
@@ -1,13 +0,0 @@
-num_scal_reads = 238
-
-scal_read_bcm1_current = 65.3904, 65.8471, 65.5617, 66.385, 66.4372, 66.4948, 66.5276, 66.2301, 66.9749, 66.5255, 65.6394, 65.301, 65.2118, 65.5959, 65.3136, 65.5845, 66.0014, 66.0064, 65.9074, 66.5556, 66.3279, 66.2721, 66.7376, 66.7436, 66.406, 66.1495, 66.3664, 66.8288, 66.1698, 65.7488, 65.8068, 65.5182, 65.4781, 65.6477, 65.3168, 65.5482, 65.6113, 65.6373, 65.7855, 65.8375, 65.9434, 66.0618, 65.9619, 65.5811, 66.5881, 66.8738, 66.7127, 66.5399, 66.8307, 66.5464, 66.5779, 66.3498, 66.1766, 66.3075, 66.348, 66.579, 65.731, 65.3561, 65.7531, 65.2712, 65.3861, 65.255, 65.5454, 65.4159, 65.9244, 65.9328, 65.4754, 65.4301, 65.3063, 65.2325, 65.4436, 65.6716, 65.6443, 65.6555, 65.7512, 65.5462, 65.6659, 65.5153, 65.9228, 65.665, 65.3787, 65.6251, 65.8003, 65.3902, 65.2553, 65.3407, 65.3627, 65.3714, 65.6989, 65.4978, 65.4183, 65.8765, 66.3749, 66.2406, 65.9588, 66.2009, 66.4822, 66.6537, 66.0356, 65.9948, 66.0481, 66.2361, 65.9392, 65.6609, 65.2282, 65.2438, 65.5212, 65.605, 65.4217, 65.3312, 65.1659, 65.2751, 65.3517, 65.4686, 65.8597, 65.7995, 65.7597, 66.3868, 66.3652, 66.298, 66.2605, 66.0745, 66.3122, 66.3745, 66.2215, 66.3926, 66.3646, 65.968, 65.8704, 65.8715, 66.0966, 65.7821, 65.7141, 65.9112, 65.8669, 65.988, 65.941, 65.9379, 65.7818, 66.0316, 66.0552, 65.7001, 65.626, 65.796, 65.7736, 65.9744, 65.9549, 65.8338, 65.65, 65.87, 65.529, 65.9812, 65.9359, 65.6887, 64.7208, 65.0609, 64.9503, 64.9911, 65.2434, 65.385, 65.3907, 65.2979, 66.0045, 66.3613, 66.2676, 66.2715, 66.1884, 66.2915, 66.0623, 65.6283, 65.1534, 65.3824, 65.4183, 65.2315, 65.0535, 65.3601, 65.359, 65.6954, 65.7067, 65.2618, 65.3313, 65.9207, 66.0107, 66.3749, 66.4201, 66.1062, 66.5425, 66.4121, 66.6773, 66.5051, 65.7641, 66.1912, 65.71, 65.7193, 65.902, 65.8496, 65.9258, 65.9523, 65.72, 65.9785, 65.7826, 65.4782, 65.7931, 66.0113, 65.7633, 65.7015, 65.6462, 65.7985, 65.7667, 65.6512, 65.5825, 66.0532, 66.0974, 66.0932, 65.858, 65.7763, 65.7491, 65.8858, 65.8141, 66.1577, 65.6943, 65.6536, 65.411, 65.7414, 66.0504, 65.6806, 65.4437, 65.4615, 65.4244, 65.6197, 65.7904, 65.7287, 65.3009, 65.599, 65.9299, 65.435, 64.938, 64.95
-
-scal_read_bcm2_current = 66.7903, 67.0367, 66.7463, 67.5848, 67.6379, 67.6961, 67.7296, 67.4258, 68.187, 67.7278, 66.8266, 66.4824, 66.3923, 66.7842, 66.5002, 66.7733, 67.1974, 67.2024, 67.1022, 67.7632, 67.531, 67.478, 67.9498, 67.9556, 67.6118, 67.3509, 67.5728, 68.044, 67.3737, 66.9449, 67.0036, 66.7104, 66.6693, 66.8423, 66.5085, 66.7425, 66.8064, 66.8335, 66.9844, 67.0382, 67.1458, 67.2668, 67.1649, 66.7781, 67.8035, 68.0967, 67.933, 67.7563, 68.0314, 67.7631, 67.7956, 67.5629, 67.3863, 67.5192, 67.56, 67.7963, 66.9331, 66.5527, 66.9555, 66.4662, 66.5837, 66.4504, 66.7467, 66.615, 67.1331, 67.1418, 66.677, 66.6321, 66.5053, 66.4319, 66.6468, 66.8784, 66.8517, 66.8635, 66.9608, 66.7501, 66.8755, 66.7223, 67.1367, 66.8742, 66.5831, 66.8345, 67.0135, 66.5956, 66.4587, 66.5455, 66.5687, 66.5781, 66.9108, 66.7068, 66.6271, 67.0925, 67.6004, 67.465, 67.1782, 67.4245, 67.7083, 67.8866, 67.2575, 67.2171, 67.2712, 67.4625, 67.1605, 66.8767, 66.4377, 66.4549, 66.737, 66.8246, 66.6377, 66.5459, 66.377, 66.4888, 66.5677, 66.6869, 67.0854, 67.0244, 66.985, 67.6245, 67.6003, 67.5324, 67.4945, 67.3061, 67.5475, 67.6118, 67.4554, 67.6303, 67.6026, 67.1989, 67.1005, 67.1018, 67.3305, 67.0128, 66.9415, 67.143, 67.098, 67.222, 67.1729, 67.1708, 67.0141, 67.2669, 67.2904, 66.9288, 66.8533, 67.0265, 67.0034, 67.2048, 67.1887, 67.0667, 66.8789, 67.1019, 66.7556, 67.2156, 67.1674, 66.9187, 65.9339, 66.281, 66.1688, 66.2107, 66.4682, 66.6125, 66.6187, 66.5245, 67.2435, 67.6085, 67.5124, 67.5164, 67.4324, 67.5371, 67.3037, 66.8632, 66.3802, 66.6137, 66.6508, 66.46, 66.281, 66.5931, 66.5928, 66.9349, 66.9474, 66.4945, 66.5667, 67.1653, 67.2578, 67.6288, 67.6752, 67.3564, 67.8001, 67.6765, 67.9387, 67.7633, 67.01, 67.4451, 66.9558, 66.9656, 67.1554, 67.099, 67.177, 67.2044, 66.9687, 67.2317, 67.0322, 66.7238, 67.0438, 67.2657, 67.0141, 66.9515, 66.8959, 67.051, 67.0204, 66.9016, 66.8321, 67.3118, 67.3564, 67.3536, 67.1131, 67.0336, 67.0038, 67.145, 67.0715, 67.4217, 66.9508, 66.9093, 66.6628, 66.9993, 67.3142, 66.9389, 66.698, 66.7169, 66.6801, 66.8788, 67.052, 66.9902, 66.555, 66.8586, 67.1956, 66.6914, 66.1847, 66.2024
-
-scal_read_bcm4a_current = 130.832, 131.612, 131.045, 132.721, 132.816, 132.931, 132.99, 132.384, 133.909, 132.995, 131.201, 130.522, 130.338, 131.109, 130.54, 131.09, 131.947, 131.955, 131.758, 133.092, 132.625, 132.517, 133.459, 133.473, 132.795, 132.271, 132.717, 133.672, 132.337, 131.493, 131.618, 131.021, 130.928, 131.265, 130.6, 131.068, 131.217, 131.274, 131.572, 131.687, 131.899, 132.144, 131.936, 131.17, 133.229, 133.816, 133.492, 133.144, 133.718, 133.159, 133.235, 132.787, 132.433, 132.696, 132.788, 133.273, 131.545, 130.79, 131.595, 130.607, 130.835, 130.587, 131.179, 130.915, 131.95, 131.958, 131.036, 130.952, 130.696, 130.558, 130.992, 131.46, 131.411, 131.432, 131.633, 131.224, 131.456, 131.14, 131.984, 131.469, 130.885, 131.379, 131.734, 130.909, 130.635, 130.81, 130.867, 130.886, 131.548, 131.148, 130.986, 131.913, 132.945, 132.677, 132.101, 132.584, 133.154, 133.522, 132.266, 132.178, 132.295, 132.676, 132.065, 131.501, 130.612, 130.64, 131.195, 131.377, 131.006, 130.828, 130.501, 130.727, 130.879, 131.119, 131.931, 131.806, 131.728, 133.021, 132.974, 132.846, 132.766, 132.372, 132.855, 132.988, 132.691, 133.023, 132.978, 132.186, 131.999, 131.998, 132.455, 131.813, 131.673, 132.08, 131.985, 132.233, 132.143, 132.129, 131.815, 132.341, 132.395, 131.67, 131.532, 131.879, 131.839, 132.25, 132.218, 131.981, 131.603, 132.053, 131.359, 132.274, 132.179, 131.682, 129.734, 130.442, 130.205, 130.287, 130.806, 131.098, 131.115, 130.928, 132.353, 133.077, 132.891, 132.918, 132.744, 132.947, 132.481, 131.611, 130.648, 131.133, 131.219, 130.838, 130.474, 131.089, 131.069, 131.763, 131.796, 130.892, 131.03, 132.23, 132.409, 133.157, 133.26, 132.627, 133.512, 133.253, 133.782, 133.445, 131.953, 132.831, 131.852, 131.877, 132.236, 132.132, 132.281, 132.349, 131.88, 132.399, 131.997, 131.376, 132.04, 132.497, 131.987, 131.851, 131.735, 132.048, 131.987, 131.758, 131.641, 132.602, 132.696, 132.69, 132.206, 132.03, 131.981, 132.273, 132.146, 132.859, 131.886, 131.809, 131.319, 132.015, 132.656, 131.899, 131.412, 131.434, 131.364, 131.769, 132.111, 131.991, 131.128, 131.746, 132.425, 131.434, 130.439, 130.47
-
-scal_read_bcm4b_current = 186.427, 187.922, 186.853, 188.754, 189.066, 189.434, 189.087, 188.058, 190.236, 188.809, 186.201, 185.346, 185.365, 186.522, 185.274, 186.164, 187.368, 187.506, 187.218, 188.984, 188.233, 188.073, 189.43, 189.597, 189.635, 188.526, 189.178, 190.038, 187.967, 187.263, 187.272, 186.397, 185.939, 186.474, 185.549, 186.3, 186.416, 186.385, 186.749, 187.043, 187.198, 187.638, 187.414, 186.775, 189.412, 190.199, 189.586, 189.18, 190.481, 189.236, 189.197, 188.44, 187.981, 188.475, 188.485, 189.051, 186.621, 185.538, 186.766, 185.532, 186.028, 185.595, 186.161, 185.977, 187.715, 187.881, 187.066, 186.404, 185.801, 185.662, 186.185, 187.034, 186.916, 186.975, 187.717, 187.342, 187.444, 186.749, 188.286, 187.575, 186.916, 186.875, 187.216, 186.1, 185.834, 185.904, 185.959, 186.184, 187.128, 186.515, 186.378, 187.569, 189.258, 189.173, 188.226, 189.189, 190.38, 190.454, 187.941, 187.675, 188.098, 189.022, 188.146, 187.262, 185.674, 186.123, 186.922, 186.777, 186.222, 185.925, 185.407, 185.892, 186.159, 186.386, 187.742, 187.41, 187.432, 189.289, 189.131, 188.83, 188.966, 188.323, 188.88, 189.162, 188.712, 189.041, 188.844, 187.59, 187.711, 187.613, 188.376, 188.267, 188.007, 187.885, 187.526, 187.836, 187.649, 187.61, 187.121, 187.791, 187.919, 186.971, 186.917, 187.511, 187.252, 187.85, 187.923, 187.82, 187.314, 187.985, 186.807, 188.238, 188.021, 188, 185.782, 186.13, 185.394, 185.452, 186.085, 186.433, 186.32, 186.185, 188.02, 189.131, 189.036, 188.974, 188.692, 189.08, 188.302, 187.008, 185.576, 186.24, 186.351, 185.731, 185.562, 186.546, 186.715, 187.671, 187.597, 186.146, 186.17, 187.933, 188.136, 189.294, 190.226, 188.858, 189.974, 189.387, 190.349, 189.964, 187.471, 188.798, 187.492, 187.65, 188.222, 187.988, 188.326, 188.445, 187.278, 188.153, 188.027, 188.275, 188.501, 188.694, 187.586, 187.83, 187.626, 187.848, 187.581, 187.229, 187.029, 188.296, 188.333, 188.329, 187.627, 187.372, 187.334, 187.937, 187.978, 189.235, 187.812, 187.894, 187.069, 187.884, 188.597, 187.509, 186.752, 187.619, 188.231, 188.694, 188.946, 188.106, 186.831, 187.463, 188.513, 186.958, 185.524, 185.494
-
-scal_read_bcm17_current = -62.2173, -61.9717, -62.1117, -61.701, -61.6758, -61.6471, -61.6274, -61.7838, -61.4084, -61.6312, -62.0685, -62.2373, -62.284, -62.0916, -62.2288, -62.0971, -61.8901, -61.8881, -61.937, -61.6117, -61.7228, -61.7451, -61.518, -61.5144, -61.6813, -61.8059, -61.6963, -61.4666, -61.7942, -62.0044, -61.9769, -62.116, -62.1359, -62.0545, -62.22, -62.1038, -62.0714, -62.0597, -61.9861, -61.9574, -61.8993, -61.837, -61.8899, -62.0779, -61.5809, -61.4351, -61.5142, -61.5972, -61.4199, -61.5935, -61.5773, -61.6899, -61.7713, -61.7118, -61.6921, -61.5781, -61.9987, -62.1819, -61.9853, -62.2216, -62.1631, -62.2294, -62.085, -62.1498, -61.8988, -61.8956, -62.1244, -62.146, -62.2072, -62.242, -62.1389, -62.0223, -62.0334, -62.0277, -61.9823, -62.0849, -62.028, -62.1031, -61.8999, -62.0267, -62.1674, -62.0451, -61.9602, -62.1579, -62.22, -62.1775, -62.1624, -62.1559, -61.9964, -62.0947, -62.1337, -61.9061, -61.6594, -61.7267, -61.8678, -61.7423, -61.5993, -61.5134, -61.8214, -61.843, -61.8179, -61.7263, -61.87, -62.0047, -62.2173, -62.2126, -62.0763, -62.0338, -62.1254, -62.1653, -62.2455, -62.1914, -62.1509, -62.0923, -61.8964, -61.9235, -61.9427, -61.6317, -61.6445, -61.6783, -61.6944, -61.7869, -61.6661, -61.6378, -61.716, -61.633, -61.6471, -61.8443, -61.8933, -61.8925, -61.7797, -61.935, -61.9692, -61.8683, -61.888, -61.8296, -61.8529, -61.8517, -61.9238, -61.8012, -61.7893, -61.9668, -62.0014, -61.9158, -61.9242, -61.8178, -61.8372, -61.9001, -61.9912, -61.8785, -62.0477, -61.8244, -61.8488, -61.969, -62.4491, -62.281, -62.3355, -62.3131, -62.1844, -62.1128, -62.1104, -62.1543, -61.8044, -61.6282, -61.6733, -61.673, -61.7166, -61.6625, -61.7768, -61.9912, -62.2227, -62.1068, -62.0892, -62.1823, -62.269, -62.1169, -62.1179, -61.9478, -61.9401, -62.1597, -62.126, -61.8314, -61.7869, -61.6032, -61.5795, -61.7367, -61.5149, -61.581, -61.4454, -61.5351, -61.9022, -61.6875, -61.9264, -61.9189, -61.8341, -61.8581, -61.8147, -61.8012, -61.9137, -61.7869, -61.8851, -62.0357, -61.8801, -61.7693, -61.8897, -61.9205, -61.9495, -61.8789, -61.896, -61.9521, -61.9882, -61.7512, -61.7272, -61.7326, -61.8502, -61.8927, -61.9029, -61.8347, -61.8715, -61.698, -61.9252, -61.9452, -62.0655, -61.8998, -61.7418, -61.921, -62.0394, -62.0338, -62.0565, -61.9584, -61.8731, -61.9023, -62.1119, -61.9615, -61.7952, -62.0443, -62.2919, -62.2883
-
-scal_read_event = 1, 1627, 3279, 4922, 6609, 8269, 9916, 10000, 11668, 13335, 14979, 16594, 18242, 19872, 20000, 21647, 23289, 24944, 26596, 28264, 29937, 30000, 31678, 33353, 35004, 36669, 38343, 40000, 41644, 43321, 44982, 46622, 48276, 49921, 50000, 51600, 53250, 54900, 56558, 58210, 59889, 60000, 61672, 63312, 64989, 66673, 68328, 69996, 70000, 71685, 73352, 75024, 76680, 78339, 80000, 81664, 83298, 84921, 86560, 88197, 89833, 90000, 91624, 93271, 94903, 96571, 98213, 99866, 100000, 101627, 103283, 104945, 106587, 108245, 109875, 110000, 111641, 113279, 114934, 116577, 118235, 119904, 120000, 121636, 123289, 124919, 126593, 128227, 129884, 130000, 131648, 133302, 134968, 136627, 138312, 139959, 140000, 141672, 143326, 144983, 146631, 148302, 149975, 150000, 151633, 153292, 154948, 156595, 158251, 159904, 160000, 161638, 163305, 164941, 166607, 168288, 169932, 170000, 171667, 173327, 174978, 176643, 178306, 179977, 180000, 181645, 183331, 184971, 186620, 188277, 189944, 190000, 191619, 193276, 194924, 196601, 198273, 199913, 200000, 201669, 203327, 204982, 206638, 208301, 209947, 210000, 211641, 213308, 214961, 216637, 218268, 219931, 220000, 221636, 223261, 224890, 226521, 228151, 229784, 230000, 231609, 233263, 234925, 236594, 238242, 239915, 240000, 241661, 243313, 244978, 246628, 248260, 249891, 250000, 251655, 253289, 254916, 256553, 258204, 259845, 260000, 261643, 263288, 264979, 266631, 268309, 269984, 270000, 271649, 273325, 274994, 276659, 278300, 279950, 280000, 281640, 283304, 284983, 286630, 288304, 289943, 290000, 291656, 293296, 294969, 296625, 298244, 299890, 300000, 301627, 303268, 304942, 306596, 308253, 309912, 310000, 311650, 313289, 314969, 316633, 318298, 319964, 320000, 321643, 323323, 324973, 326633, 328292, 329915, 330000, 331645, 333301, 334942, 336578, 338242, 339870, 340000, 1e+38
\ No newline at end of file
diff --git a/PARAM/HMS/BCM/CALIB/bcmcurrent_1445.param b/PARAM/HMS/BCM/CALIB/bcmcurrent_1445.param
deleted file mode 100644
index f242f60f8e5e442ff19a44a045a9165018311146..0000000000000000000000000000000000000000
--- a/PARAM/HMS/BCM/CALIB/bcmcurrent_1445.param
+++ /dev/null
@@ -1,13 +0,0 @@
-num_scal_reads = 154
-
-scal_read_bcm1_current = 50.5009, 50.1226, 50.4317, 50.9125, 51.0089, 50.834, 50.6728, 50.6553, 50.7497, 50.884, 50.8908, 50.9264, 50.9982, 50.5139, 50.6805, 50.5674, 50.6736, 50.93, 50.7266, 50.3512, 50.1216, 50.6034, 50.7112, 50.5524, 50.7244, 50.7601, 50.7551, 51.6381, 51.1424, 23.872, 0.0459189, 0.0461081, 0.0512322, 0.0458103, 0.0457565, 0.0459565, 0.0460539, 0.0458101, 0.0457397, 0.933966, 0.663487, 0.0460929, 0.0463246, 0.0462704, 0.0460112, 0.0462163, 0.0461621, 0.0461472, 1.04107, 2.23518, 3.0138, 5.55885, 7.71833, 8.23467, 9.50704, 11.7628, 13.244, 16.0619, 16.987, 19.049, 21.6977, 22.7971, 24.0462, 25.0353, 27.9611, 28.9614, 31.692, 32.2846, 33.2246, 36.1603, 37.9374, 38.8497, 39.8207, 41.6082, 44.1141, 45.0258, 45.6829, 45.9503, 48.5651, 48.7136, 50.2098, 50.7766, 51.0219, 51.1066, 50.8423, 51.0143, 51.1652, 51.1069, 51.1026, 51.2929, 51.0515, 51.0035, 50.9865, 50.9512, 51.0938, 50.7323, 50.9158, 50.9579, 50.8706, 50.7865, 50.8047, 50.9917, 50.8262, 50.7701, 50.8588, 50.9776, 51.1634, 51.3144, 50.9601, 50.8978, 51.0119, 50.9458, 50.9223, 51.0492, 51.1996, 51.4882, 51.4417, 51.1692, 51.0929, 51.3034, 51.3091, 51.2376, 50.9895, 51.326, 51.0954, 50.9036, 50.6393, 51.2195, 51.0364, 51.3871, 51.4313, 51.3097, 51.316, 51.0998, 51.0606, 51.1745, 50.9071, 50.8718, 51.146, 51.4338, 51.1482, 51.1771, 51.1448, 51.2715, 51.2599, 51.3172, 51.6005, 51.5774, 51.3718, 51.3372, 50.8894, 51.2431, 51.0445, 50.9275
-
-scal_read_bcm2_current = 51.107, 51.2012, 51.515, 52.0026, 52.1005, 51.9226, 51.759, 51.7409, 51.8363, 51.9728, 51.9803, 52.017, 52.0889, 51.5971, 51.7656, 51.651, 51.758, 52.0186, 51.8127, 51.4313, 51.1977, 51.6873, 51.7962, 51.6348, 51.8089, 51.8449, 51.8393, 52.7351, 52.2321, 24.3988, 0.0825212, 0.0824887, 0.0826405, 0.0825207, 0.0825854, 0.0827048, 0.082553, 0.0826492, 0.0825764, 0.988121, 0.712286, 0.0826083, 0.0826174, 0.082553, 0.0825112, 0.0826174, 0.082553, 0.0825435, 1.09689, 2.31414, 3.10706, 5.70161, 7.90296, 8.42987, 9.72754, 12.0291, 13.5405, 16.416, 17.3599, 19.4644, 22.1667, 23.2891, 24.5635, 25.5728, 28.5579, 29.578, 32.3636, 32.9673, 33.9249, 36.9206, 38.7341, 39.6655, 40.6573, 42.4858, 45.0531, 45.9845, 46.6566, 46.9295, 49.6026, 49.7514, 51.2744, 51.8513, 52.0993, 52.1843, 51.9164, 52.0912, 52.2426, 52.184, 52.1789, 52.3725, 52.1266, 52.079, 52.0242, 52.026, 52.1704, 51.8034, 51.9895, 52.0313, 51.9428, 51.857, 51.8752, 52.0652, 51.8971, 51.8253, 51.9303, 52.0506, 52.2384, 52.3914, 52.0313, 51.9679, 52.0832, 52.0158, 51.9918, 52.1203, 52.2733, 52.566, 52.5186, 52.2423, 52.1643, 52.3774, 52.3827, 52.3098, 52.0582, 52.3997, 52.166, 51.9704, 51.7026, 52.291, 52.1054, 52.4609, 52.5058, 52.3822, 52.3885, 52.1694, 52.1292, 52.244, 51.9726, 51.9353, 52.2138, 52.5061, 52.2161, 52.2448, 52.2122, 52.3407, 52.3292, 52.3869, 52.6738, 52.6502, 52.4411, 52.4065, 51.9524, 52.3106, 52.1083, 51.9915
-
-scal_read_bcm4a_current = 100.689, 100.366, 100.967, 101.923, 102.12, 101.769, 101.442, 101.395, 101.575, 101.843, 101.853, 101.919, 102.061, 101.09, 101.406, 101.162, 101.373, 101.879, 101.478, 100.721, 100.264, 101.22, 101.436, 101.115, 101.459, 101.536, 101.52, 103.273, 102.264, 48.2115, 0.982674, 0.982136, 0.981667, 0.982748, 0.98367, 0.980509, 0.981291, 0.98313, 0.984677, 2.44656, 2.00271, 0.982516, 0.982289, 0.982288, 0.98159, 0.983746, 0.981981, 0.983055, 2.62343, 4.62117, 6.15407, 11.226, 15.5253, 16.5565, 19.0979, 23.6003, 26.5566, 32.179, 34.0255, 38.1378, 43.4135, 45.6018, 48.0935, 50.0602, 55.8857, 57.8801, 63.3179, 64.496, 66.3584, 72.1925, 75.7303, 77.5466, 79.4741, 83.0398, 88.0343, 89.8509, 91.1629, 91.6983, 96.9026, 97.1968, 100.177, 101.303, 101.786, 101.951, 101.437, 101.776, 102.065, 101.938, 101.918, 102.293, 101.816, 101.721, 101.728, 101.613, 101.885, 101.17, 101.523, 101.603, 101.43, 101.257, 101.293, 101.652, 101.318, 101.212, 101.382, 101.615, 101.979, 102.272, 101.557, 101.426, 101.655, 101.52, 101.463, 101.701, 102.003, 102.575, 102.476, 101.935, 101.765, 102.171, 102.176, 102.042, 101.543, 102.196, 101.737, 101.355, 100.838, 101.989, 101.623, 102.32, 102.414, 102.162, 102.161, 101.719, 101.638, 101.865, 101.329, 101.26, 101.801, 102.364, 101.792, 101.846, 101.775, 102.016, 101.991, 102.095, 102.658, 102.603, 102.193, 102.122, 101.24, 101.934, 101.54, 101.31
-
-scal_read_bcm4b_current = 143.422, 143.043, 144.189, 145.355, 145.535, 144.64, 144.314, 144.49, 144.625, 145.143, 144.995, 145.004, 145.502, 144.177, 144.664, 144.103, 144.325, 145.082, 144.23, 143.313, 143.051, 144.731, 145.288, 144.922, 145.305, 145.669, 145.014, 147.388, 145.879, 69.6122, 2.72229, 2.73309, 2.72393, 2.71838, 2.72321, 2.72923, 2.7347, 2.71906, 2.70639, 4.29667, 3.83664, 2.72416, 2.71355, 2.72068, 2.75026, 2.74596, 2.74274, 2.73432, 4.51083, 6.7352, 8.85106, 16.0831, 22.1572, 23.5979, 27.2098, 33.6305, 37.859, 45.8833, 48.5111, 54.3043, 61.9179, 64.9889, 68.5411, 71.2345, 79.5069, 82.4891, 90.3633, 91.9081, 94.4824, 103.092, 108.018, 110.562, 113.251, 118.261, 125.429, 127.878, 129.849, 130.627, 138.022, 138.764, 142.845, 144.122, 144.865, 145.029, 145.429, 145.678, 145.806, 145.378, 145.432, 145.786, 145.281, 145.164, 145.288, 145.028, 145.378, 144.528, 145.127, 144.971, 144.763, 144.294, 144.339, 144.583, 144.123, 143.942, 144.235, 145.002, 145.824, 145.775, 144.542, 144.343, 144.779, 144.414, 144.673, 144.834, 145.471, 146.056, 145.629, 145.353, 145.186, 145.589, 145.625, 145.182, 144.806, 145.895, 145.732, 145.235, 144.113, 145.446, 144.91, 145.873, 145.906, 145.306, 145.291, 144.518, 144.565, 145.216, 144.363, 144.343, 145.038, 145.754, 144.86, 144.931, 145.301, 145.587, 145.306, 145.468, 146.329, 146.176, 145.326, 145.257, 144.238, 145.397, 144.734, 144.339
-
-scal_read_bcm17_current = -69.8798, -69.6452, -69.4958, -69.2636, -69.2201, -69.307, -69.3852, -69.3915, -69.3479, -69.2846, -69.2793, -69.2631, -69.2305, -69.4658, -69.3841, -69.442, -69.3949, -69.274, -69.3746, -69.5564, -69.6684, -69.4324, -69.379, -69.4549, -69.3745, -69.3579, -69.3641, -68.9379, -69.1784, -82.2836, -93.7338, -93.7346, -93.7353, -93.735, -93.7347, -93.7352, -93.7353, -93.7356, -93.7361, -93.4938, -93.5672, -93.7359, -93.7353, -93.7347, -93.7351, -93.735, -93.7344, -93.7352, -93.4643, -93.1228, -92.7666, -91.5475, -90.5119, -90.2592, -89.6394, -88.5312, -87.8042, -86.42, -85.9625, -84.9424, -83.6375, -83.095, -82.48, -81.9945, -80.5547, -80.0642, -78.7286, -78.4383, -77.9765, -76.5487, -75.6857, -75.2412, -74.7671, -73.8908, -72.6633, -72.2131, -71.8891, -71.7586, -70.485, -70.4128, -69.6837, -69.4048, -69.2866, -69.2484, -69.3763, -69.2926, -69.2186, -69.2484, -69.2544, -69.164, -69.2809, -69.3035, -69.3074, -69.3337, -69.2665, -69.4394, -69.3528, -69.3322, -69.3745, -69.4168, -69.4101, -69.3223, -69.4043, -69.4373, -69.3904, -69.3356, -69.2461, -69.1745, -69.3488, -69.3819, -69.3277, -69.3576, -69.3703, -69.3104, -69.2379, -69.0981, -69.1214, -69.2539, -69.2882, -69.1907, -69.1864, -69.2208, -69.3433, -69.1819, -69.2937, -69.3854, -69.5126, -69.2363, -69.3256, -69.156, -69.1359, -69.1987, -69.1969, -69.301, -69.3223, -69.2685, -69.3953, -69.4146, -69.2831, -69.1425, -69.2863, -69.2725, -69.289, -69.2288, -69.2341, -69.2071, -69.0717, -69.0845, -69.1838, -69.2031, -69.4198, -69.2541, -69.3497, -69.4087
-
-scal_read_event = 1, 5008, 10000, 15066, 20000, 25000, 30000, 35001, 40000, 45038, 50000, 55060, 60000, 64976, 70000, 75057, 80000, 85062, 90000, 95032, 100000, 104996, 110000, 114975, 120000, 125002, 130000, 135015, 140000, 142461, 142670, 142877, 143082, 143289, 143497, 143701, 143911, 144115, 144322, 144723, 145061, 145266, 145474, 145678, 145883, 146088, 146294, 146498, 146907, 147551, 148347, 149525, 150000, 151715, 153626, 155745, 158115, 160000, 162751, 165704, 168938, 170000, 173396, 176868, 180000, 183827, 187799, 190000, 194091, 198377, 200000, 204513, 209029, 210000, 214687, 219490, 220000, 224773, 229728, 230000, 234973, 240000, 245038, 250000, 255038, 260000, 265080, 270000, 275023, 280000, 285041, 289999, 290000, 295042, 300000, 305031, 310000, 315074, 320000, 325036, 330000, 334992, 339982, 340000, 345002, 350000, 355032, 360000, 365048, 370000, 374998, 380000, 385069, 390000, 395068, 400000, 405045, 410000, 415052, 420000, 425028, 430000, 434999, 440000, 445063, 450000, 454976, 460000, 465023, 470000, 474986, 480000, 485012, 490000, 495016, 500000, 505007, 510000, 515066, 520000, 525006, 530000, 535056, 540000, 545064, 550000, 555058, 560000, 565015, 570000, 574956, 580000, 585070, 1e+38
\ No newline at end of file
diff --git a/PARAM/HMS/CAL/hcal_calib.param b/PARAM/HMS/CAL/hcal_calib.param
index 8bbb6b4d427ffd902d2e10b9db901bf4bb0baebe..78713777cb967b1eec4b7c11d25a92921d314d2b 100644
--- a/PARAM/HMS/CAL/hcal_calib.param
+++ b/PARAM/HMS/CAL/hcal_calib.param
@@ -1,10 +1,31 @@
; Calibration constants for run 3599_300000, 82063 events processed
-hcal_pos_gain_cor= 0.00, 6.90, 8.81, 9.47, 8.98, 11.13, 11.55, 11.31, 8.99, 11.39, 11.27, 9.62, 0.00,
- 4.91, 9.56, 6.83, 10.18, 8.10, 6.27, 7.73, 6.87, 8.17, 8.58, 9.22, 11.42, 26.16,
- 14.98, 14.84, 16.03, 19.82, 16.05, 16.03, 16.95, 17.22, 15.08, 23.03, 14.67, 19.19, 14.95,
- 34.79, 21.24, 24.97, 23.20, 23.61, 23.88, 27.17, 23.03, 22.58, 24.43, 23.04, 23.78, 19.93,
-hcal_neg_gain_cor= 0.00, 12.42, 11.75, 9.95, 10.73, 10.69, 12.22, 15.93, 12.46, 10.97, 11.58, 12.72, 0.00,
- 28.62, 11.66, 14.36, 12.45, 14.44, 15.73, 14.08, 14.53, 15.22, 12.58, 13.27, 11.14, 6.52,
- 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+;hcal_pos_gain_cor= 0.00, 6.90, 8.81, 9.47, 8.98, 11.13, 11.55, 11.31, 8.99, 11.39, 11.27, 9.62, 0.00,
+; 4.91, 9.56, 6.83, 10.18, 8.10, 6.27, 7.73, 6.87, 8.17, 8.58, 9.22, 11.42, 26.16,
+; 14.98, 14.84, 16.03, 19.82, 16.05, 16.03, 16.95, 17.22, 15.08, 23.03, 14.67, 19.19, 14.95,
+; 34.79, 21.24, 24.97, 23.20, 23.61, 23.88, 27.17, 23.03, 22.58, 24.43, 23.04, 23.78, 19.93,
+;hcal_neg_gain_cor= 0.00, 12.42, 11.75, 9.95, 10.73, 10.69, 12.22, 15.93, 12.46, 10.97, 11.58, 12.72, 0.00,
+; 28.62, 11.66, 14.36, 12.45, 14.44, 15.73, 14.08, 14.53, 15.22, 12.58, 13.27, 11.14, 6.52,
+; 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+
+
+;hcal_pos_gain_cor= 17.10, 8.20, 12.38, 9.58, 11.43, 13.68, 12.00, 9.86, 11.04, 15.58, 10.80, 10.40, 0.00,
+; 8.96, 12.40, 7.96, 11.44, 7.30, 6.77, 8.86, 8.47, 6.55, 10.57, 8.51, 13.45, 26.00,
+; 23.48, 17.17, 17.95, 21.45, 17.40, 16.59, 21.26, 19.21, 18.92, 24.68, 17.54, 19.11, 14.00,
+; 32.12, 17.12, 23.15, 19.66, 20.54, 20.71, 22.91, 21.45, 22.23, 25.00, 20.28, 25.11, 0.00,
+;hcal_neg_gain_cor= 12.15, 14.04, 8.81, 10.88, 10.39, 10.98, 12.25, 18.84, 11.19, 9.55, 14.43, 12.40, 6.00,
+; 11.72, 11.58, 13.93, 13.19, 16.90, 15.50, 15.40, 14.68, 18.39, 11.62, 17.04, 11.35, 0.00,
+; 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+
+; Calibration constants for file hms_coin_replay_production_all_5132_100000.root, 22346 events processed
+
+hcal_pos_gain_cor= 12.17, 5.70, 8.82, 8.47, 8.31, 10.06, 10.66, 11.08, 8.37, 11.78, 13.02, 10.29, 12.00,
+ 9.22, 8.24, 7.84, 11.23, 8.22, 6.42, 7.39, 6.25, 7.97, 7.51, 7.74, 7.85, 15.46,
+ 19.37, 12.92, 14.53, 20.28, 13.38, 15.47, 16.40, 15.08, 14.41, 22.68, 13.29, 17.12, 16.32,
+ 28.85, 17.90, 18.65, 17.45, 18.62, 19.56, 21.79, 17.35, 18.18, 19.42, 19.05, 18.64, 13.23,
+hcal_neg_gain_cor= 12.34, 12.23, 9.94, 10.51, 10.11, 11.33, 11.83, 14.05, 11.49, 9.64, 9.22, 10.95, 11.75,
+ 12.66, 11.86, 12.72, 10.97, 13.74, 13.02, 13.26, 13.80, 14.74, 11.30, 12.38, 12.04, 1.72,
0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+ 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
\ No newline at end of file
diff --git a/PARAM/HMS/CAL/hcal_cuts.param b/PARAM/HMS/CAL/hcal_cuts.param
index 3d883772feba1078f49ad61651469a4c1f5c3eb4..7e2f910bb928443cdf8735b5b1aa0ef7a50e756e 100644
--- a/PARAM/HMS/CAL/hcal_cuts.param
+++ b/PARAM/HMS/CAL/hcal_cuts.param
@@ -8,23 +8,23 @@ hcal_ADCmode=1
; FADC Pulse time window cuts
hcal_adc_tdc_offset = 200.
-hcal_pos_AdcTimeWindowMin = -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.
+hcal_pos_AdcTimeWindowMin = -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120.,
+ -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120.,
+ -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120.,
+ -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120.
-hcal_neg_AdcTimeWindowMin = -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
+hcal_neg_AdcTimeWindowMin = -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120.,
+ -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120., -120.,
0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,
0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.
-hcal_pos_AdcTimeWindowMax = 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.
+hcal_pos_AdcTimeWindowMax = -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50.,
+ -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50.,
+ -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50.,
+ -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50.
-hcal_neg_AdcTimeWindowMax = 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
+hcal_neg_AdcTimeWindowMax = -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50.,
+ -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50., -50.,
0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,
0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.
diff --git a/PARAM/HMS/CER/hcer_calib.param b/PARAM/HMS/CER/hcer_calib.param
index ca8cef457c088695b352bf3d6468e1e82931ba9c..73475915f135ea943b34a248486d5715fda3e43d 100644
--- a/PARAM/HMS/CER/hcer_calib.param
+++ b/PARAM/HMS/CER/hcer_calib.param
@@ -1 +1,2 @@
-hcer_adc_to_npe = 1./5.735, 1./5.741
\ No newline at end of file
+;hcer_adc_to_npe = 1./5.735, 1./5.741
+hcer_adc_to_npe = 1./10.69, 1./9.81
\ No newline at end of file
diff --git a/PARAM/HMS/CER/hcer_cuts.param b/PARAM/HMS/CER/hcer_cuts.param
index 1fc324379940ba45583a3e932e20c9e212ee25af..cede2addb2e6b3014c15911507a553c656f8a241 100644
--- a/PARAM/HMS/CER/hcer_cuts.param
+++ b/PARAM/HMS/CER/hcer_cuts.param
@@ -22,5 +22,5 @@ hcer_npe_thresh = 0.5
; ADC time window cut values used to select "good" ADC events
hcer_adc_tdc_offset= 0.
-hcer_adcTimeWindowMin = -1000., -1000.
-hcer_adcTimeWindowMax = 1000., 1000.
+hcer_adcTimeWindowMin = 60., 60.
+hcer_adcTimeWindowMax = 150., 150.
diff --git a/PARAM/HMS/DC/hdc_calib.param b/PARAM/HMS/DC/hdc_calib.param
index 2bcf5ed95e4478fad36688e2cf07fd48a25d3928..67dbaad1f97f8fae3158427ad6387b2875f72cc9 100644
--- a/PARAM/HMS/DC/hdc_calib.param
+++ b/PARAM/HMS/DC/hdc_calib.param
@@ -1,127 +1,127 @@
-; Lookup Table: RUN 3454
+; Lookup Table: RUN 4698
; number of bins in time to distance lookup table
hdriftbins = 190
; number of 1st bin in table in ns
hdrift1stbin=1.000000
; bin size in ns
hdriftbinsz=1
-hwc1u1fract=0.00064,0.00175,0.00338,0.00600,0.00929,0.01351,0.01845,0.02403,0.03027,0.03705,0.04428,0.05206,0.06018,0.06854,0.07719,0.08643,0.09591,0.10555,0.11575
-0.12606,0.13687,0.14751,0.15839,0.16940,0.18038,0.19174,0.20290,0.21414,0.22562,0.23724,0.24870,0.26008,0.27161,0.28319,0.29466,0.30607,0.31739,0.32871,0.33988
-0.35128,0.36271,0.37374,0.38480,0.39585,0.40685,0.41792,0.42885,0.43954,0.45079,0.46188,0.47257,0.48356,0.49430,0.50498,0.51568,0.52621,0.53681,0.54720,0.55766
-0.56799,0.57839,0.58856,0.59893,0.60915,0.61951,0.62971,0.63973,0.64980,0.66001,0.66994,0.67990,0.68963,0.69938,0.70910,0.71874,0.72828,0.73775,0.74712,0.75653
-0.76581,0.77493,0.78399,0.79314,0.80223,0.81121,0.82021,0.82883,0.83748,0.84608,0.85476,0.86304,0.87131,0.87943,0.88731,0.89505,0.90269,0.90984,0.91674,0.92324
-0.92971,0.93579,0.94146,0.94667,0.95145,0.95574,0.95977,0.96360,0.96690,0.96981,0.97265,0.97511,0.97740,0.97936,0.98121,0.98287,0.98444,0.98582,0.98721,0.98833
-0.98936,0.99040,0.99133,0.99209,0.99289,0.99354,0.99415,0.99476,0.99529,0.99574,0.99618,0.99656,0.99690,0.99722,0.99750,0.99776,0.99801,0.99820,0.99836,0.99855
-0.99870,0.99885,0.99897,0.99906,0.99915,0.99923,0.99932,0.99939,0.99945,0.99951,0.99956,0.99960,0.99965,0.99969,0.99973,0.99976,0.99977,0.99979,0.99981,0.99984
-0.99985,0.99986,0.99987,0.99987,0.99988,0.99989,0.99990,0.99991,0.99992,0.99992,0.99993,0.99993,0.99994,0.99995,0.99995,0.99995,0.99996,0.99996,0.99997,0.99997
-0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000
-hwc1u2fract=0.00070,0.00194,0.00386,0.00664,0.01034,0.01491,0.02036,0.02638,0.03303,0.04011,0.04763,0.05549,0.06369,0.07202,0.08067,0.08978,0.09922,0.10910,0.11919
-0.12959,0.14006,0.15064,0.16170,0.17247,0.18372,0.19486,0.20610,0.21736,0.22867,0.23987,0.25127,0.26267,0.27420,0.28576,0.29703,0.30848,0.31974,0.33084,0.34226
-0.35351,0.36464,0.37577,0.38695,0.39820,0.40915,0.42007,0.43091,0.44196,0.45291,0.46370,0.47442,0.48527,0.49601,0.50662,0.51720,0.52775,0.53827,0.54861,0.55905
-0.56931,0.57966,0.58997,0.60022,0.61031,0.62028,0.63043,0.64025,0.65004,0.65980,0.66958,0.67945,0.68927,0.69896,0.70836,0.71774,0.72738,0.73696,0.74627,0.75573
-0.76482,0.77404,0.78315,0.79209,0.80114,0.81025,0.81913,0.82805,0.83678,0.84543,0.85376,0.86220,0.87038,0.87844,0.88652,0.89424,0.90180,0.90915,0.91621,0.92311
-0.92960,0.93552,0.94114,0.94647,0.95131,0.95587,0.96012,0.96386,0.96733,0.97039,0.97310,0.97554,0.97772,0.97971,0.98149,0.98306,0.98456,0.98588,0.98717,0.98830
-0.98936,0.99028,0.99119,0.99198,0.99270,0.99339,0.99402,0.99458,0.99512,0.99555,0.99600,0.99641,0.99673,0.99706,0.99737,0.99760,0.99785,0.99807,0.99829,0.99844
-0.99862,0.99877,0.99889,0.99900,0.99909,0.99920,0.99927,0.99933,0.99938,0.99944,0.99950,0.99954,0.99957,0.99961,0.99965,0.99969,0.99974,0.99977,0.99979,0.99981
-0.99983,0.99984,0.99985,0.99985,0.99987,0.99987,0.99988,0.99989,0.99990,0.99990,0.99991,0.99992,0.99992,0.99993,0.99993,0.99993,0.99994,0.99994,0.99995,0.99995
-0.99996,0.99996,0.99997,0.99997,0.99998,0.99998,0.99998,0.99999,0.99999,1.00000,1.00000
-hwc1x1fract=0.00068,0.00186,0.00393,0.00671,0.01048,0.01512,0.02029,0.02628,0.03308,0.04000,0.04776,0.05576,0.06453,0.07359,0.08286,0.09279,0.10283,0.11302,0.12348
-0.13406,0.14479,0.15571,0.16660,0.17762,0.18884,0.20009,0.21110,0.22262,0.23406,0.24535,0.25698,0.26817,0.27933,0.29043,0.30170,0.31276,0.32402,0.33509,0.34620
-0.35717,0.36829,0.37945,0.39057,0.40150,0.41208,0.42293,0.43376,0.44446,0.45526,0.46609,0.47672,0.48712,0.49780,0.50845,0.51914,0.52968,0.54002,0.55045,0.56068
-0.57081,0.58115,0.59117,0.60119,0.61128,0.62142,0.63172,0.64172,0.65146,0.66135,0.67119,0.68073,0.69019,0.69969,0.70924,0.71873,0.72839,0.73773,0.74704,0.75634
-0.76565,0.77474,0.78376,0.79265,0.80150,0.81006,0.81890,0.82771,0.83624,0.84468,0.85311,0.86138,0.86971,0.87767,0.88540,0.89271,0.90022,0.90748,0.91455,0.92126
-0.92758,0.93353,0.93927,0.94466,0.94970,0.95438,0.95862,0.96244,0.96590,0.96913,0.97203,0.97456,0.97700,0.97913,0.98104,0.98281,0.98446,0.98594,0.98719,0.98841
-0.98953,0.99053,0.99141,0.99221,0.99294,0.99356,0.99416,0.99473,0.99525,0.99573,0.99616,0.99651,0.99686,0.99716,0.99743,0.99768,0.99793,0.99811,0.99828,0.99846
-0.99859,0.99873,0.99885,0.99897,0.99908,0.99918,0.99926,0.99935,0.99941,0.99946,0.99951,0.99955,0.99959,0.99964,0.99968,0.99970,0.99973,0.99976,0.99979,0.99981
-0.99983,0.99984,0.99984,0.99985,0.99986,0.99988,0.99989,0.99990,0.99991,0.99992,0.99992,0.99993,0.99994,0.99994,0.99994,0.99995,0.99996,0.99996,0.99996,0.99997
-0.99997,0.99997,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000
-hwc1x2fract=0.00067,0.00189,0.00387,0.00686,0.01071,0.01552,0.02087,0.02694,0.03353,0.04070,0.04823,0.05634,0.06477,0.07365,0.08283,0.09243,0.10231,0.11274,0.12296
-0.13360,0.14435,0.15531,0.16640,0.17788,0.18925,0.20041,0.21187,0.22307,0.23456,0.24599,0.25751,0.26896,0.28003,0.29123,0.30255,0.31382,0.32519,0.33631,0.34744
-0.35856,0.36975,0.38108,0.39209,0.40287,0.41393,0.42471,0.43532,0.44636,0.45721,0.46810,0.47879,0.48961,0.50033,0.51091,0.52136,0.53188,0.54240,0.55277,0.56312
-0.57327,0.58326,0.59344,0.60365,0.61389,0.62401,0.63407,0.64420,0.65422,0.66396,0.67379,0.68359,0.69319,0.70283,0.71226,0.72163,0.73121,0.74065,0.75003,0.75916
-0.76817,0.77730,0.78628,0.79510,0.80397,0.81279,0.82157,0.83035,0.83902,0.84734,0.85578,0.86401,0.87230,0.88042,0.88819,0.89574,0.90322,0.91044,0.91746,0.92414
-0.93045,0.93658,0.94216,0.94746,0.95234,0.95679,0.96081,0.96452,0.96778,0.97075,0.97349,0.97592,0.97812,0.98020,0.98201,0.98381,0.98527,0.98666,0.98790,0.98901
-0.99002,0.99103,0.99190,0.99264,0.99334,0.99401,0.99459,0.99510,0.99559,0.99600,0.99639,0.99672,0.99706,0.99734,0.99758,0.99782,0.99802,0.99820,0.99839,0.99856
-0.99871,0.99883,0.99894,0.99903,0.99912,0.99922,0.99931,0.99938,0.99945,0.99949,0.99954,0.99959,0.99962,0.99967,0.99970,0.99973,0.99976,0.99979,0.99981,0.99982
-0.99983,0.99985,0.99986,0.99986,0.99987,0.99988,0.99989,0.99990,0.99990,0.99991,0.99991,0.99992,0.99993,0.99993,0.99994,0.99994,0.99995,0.99995,0.99996,0.99996
-0.99996,0.99997,0.99997,0.99997,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,1.00000
-hwc1v2fract=0.00087,0.00223,0.00415,0.00653,0.00961,0.01337,0.01784,0.02281,0.02834,0.03441,0.04097,0.04792,0.05526,0.06281,0.07087,0.07915,0.08752,0.09643,0.10571
-0.11523,0.12493,0.13482,0.14483,0.15514,0.16533,0.17578,0.18643,0.19721,0.20794,0.21891,0.22990,0.24091,0.25199,0.26306,0.27421,0.28569,0.29695,0.30829,0.31952
-0.33059,0.34189,0.35298,0.36381,0.37479,0.38588,0.39692,0.40788,0.41885,0.42998,0.44084,0.45182,0.46270,0.47368,0.48438,0.49500,0.50540,0.51604,0.52650,0.53689
-0.54736,0.55772,0.56817,0.57850,0.58864,0.59862,0.60884,0.61907,0.62932,0.63930,0.64937,0.65918,0.66906,0.67856,0.68840,0.69808,0.70774,0.71724,0.72675,0.73610
-0.74541,0.75456,0.76385,0.77287,0.78193,0.79092,0.79948,0.80810,0.81669,0.82540,0.83405,0.84226,0.85062,0.85877,0.86671,0.87442,0.88177,0.88916,0.89615,0.90304
-0.90973,0.91599,0.92194,0.92752,0.93284,0.93791,0.94299,0.94744,0.95165,0.95555,0.95926,0.96266,0.96567,0.96846,0.97107,0.97343,0.97573,0.97779,0.97965,0.98135
-0.98305,0.98451,0.98590,0.98714,0.98832,0.98937,0.99039,0.99125,0.99207,0.99281,0.99355,0.99413,0.99467,0.99519,0.99563,0.99603,0.99641,0.99675,0.99705,0.99733
-0.99757,0.99784,0.99804,0.99824,0.99841,0.99856,0.99871,0.99884,0.99895,0.99906,0.99914,0.99925,0.99932,0.99936,0.99943,0.99950,0.99954,0.99959,0.99964,0.99968
-0.99971,0.99973,0.99976,0.99979,0.99981,0.99982,0.99984,0.99986,0.99987,0.99988,0.99989,0.99989,0.99991,0.99992,0.99992,0.99993,0.99993,0.99994,0.99996,0.99996
-0.99996,0.99997,0.99997,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,1.00000,1.00000
-hwc1v1fract=0.00081,0.00208,0.00411,0.00715,0.01104,0.01572,0.02131,0.02763,0.03465,0.04208,0.05028,0.05851,0.06717,0.07618,0.08517,0.09445,0.10405,0.11391,0.12413
-0.13448,0.14519,0.15601,0.16675,0.17779,0.18879,0.20000,0.21118,0.22260,0.23391,0.24516,0.25636,0.26754,0.27877,0.29026,0.30129,0.31229,0.32331,0.33462,0.34584
-0.35715,0.36822,0.37930,0.39007,0.40090,0.41164,0.42255,0.43358,0.44446,0.45543,0.46614,0.47686,0.48740,0.49819,0.50866,0.51905,0.52932,0.53979,0.55001,0.56038
-0.57036,0.58072,0.59108,0.60136,0.61130,0.62152,0.63158,0.64163,0.65132,0.66095,0.67071,0.68032,0.68998,0.69962,0.70916,0.71860,0.72797,0.73732,0.74688,0.75605
-0.76526,0.77427,0.78328,0.79214,0.80133,0.81024,0.81882,0.82739,0.83595,0.84435,0.85274,0.86129,0.86950,0.87750,0.88509,0.89292,0.90010,0.90745,0.91462,0.92135
-0.92776,0.93395,0.93966,0.94507,0.95004,0.95470,0.95881,0.96254,0.96601,0.96914,0.97189,0.97427,0.97651,0.97846,0.98028,0.98192,0.98334,0.98468,0.98593,0.98707
-0.98807,0.98909,0.99007,0.99090,0.99170,0.99246,0.99310,0.99370,0.99427,0.99477,0.99526,0.99572,0.99608,0.99643,0.99675,0.99707,0.99731,0.99757,0.99779,0.99800
-0.99816,0.99835,0.99849,0.99860,0.99875,0.99888,0.99899,0.99908,0.99916,0.99925,0.99932,0.99939,0.99944,0.99950,0.99955,0.99960,0.99965,0.99969,0.99973,0.99975
-0.99977,0.99980,0.99982,0.99983,0.99984,0.99986,0.99987,0.99989,0.99990,0.99992,0.99992,0.99992,0.99993,0.99994,0.99995,0.99995,0.99996,0.99996,0.99996,0.99996
-0.99996,0.99996,0.99997,0.99997,0.99997,0.99998,0.99998,0.99999,1.00000,1.00000,1.00000
-hwc2v1fract=0.00064,0.00170,0.00335,0.00580,0.00902,0.01296,0.01779,0.02332,0.02941,0.03631,0.04361,0.05122,0.05960,0.06820,0.07718,0.08641,0.09615,0.10619,0.11642
-0.12698,0.13779,0.14892,0.16024,0.17157,0.18299,0.19431,0.20586,0.21757,0.22899,0.24065,0.25229,0.26395,0.27547,0.28706,0.29826,0.30964,0.32100,0.33236,0.34378
-0.35530,0.36665,0.37790,0.38908,0.40033,0.41153,0.42247,0.43332,0.44412,0.45509,0.46610,0.47690,0.48781,0.49825,0.50888,0.51925,0.52971,0.54011,0.55067,0.56108
-0.57146,0.58158,0.59172,0.60202,0.61218,0.62219,0.63230,0.64223,0.65211,0.66190,0.67167,0.68145,0.69110,0.70086,0.71018,0.71974,0.72918,0.73860,0.74781,0.75710
-0.76628,0.77525,0.78431,0.79320,0.80207,0.81083,0.81941,0.82807,0.83650,0.84479,0.85308,0.86134,0.86941,0.87722,0.88507,0.89248,0.89991,0.90686,0.91374,0.92040
-0.92668,0.93258,0.93818,0.94340,0.94839,0.95280,0.95696,0.96075,0.96410,0.96714,0.96996,0.97253,0.97488,0.97693,0.97893,0.98074,0.98237,0.98393,0.98531,0.98651
-0.98769,0.98881,0.98976,0.99066,0.99153,0.99223,0.99291,0.99354,0.99416,0.99472,0.99525,0.99568,0.99615,0.99648,0.99681,0.99712,0.99739,0.99763,0.99788,0.99809
-0.99825,0.99841,0.99855,0.99870,0.99884,0.99894,0.99904,0.99912,0.99920,0.99926,0.99934,0.99941,0.99946,0.99950,0.99954,0.99958,0.99962,0.99966,0.99970,0.99972
-0.99975,0.99976,0.99978,0.99980,0.99982,0.99984,0.99986,0.99986,0.99989,0.99990,0.99991,0.99992,0.99992,0.99993,0.99993,0.99994,0.99995,0.99995,0.99995,0.99996
-0.99996,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99999,1.00000,1.00000,1.00000
-hwc2v2fract=0.00068,0.00177,0.00342,0.00589,0.00907,0.01312,0.01794,0.02349,0.02958,0.03639,0.04369,0.05131,0.05961,0.06819,0.07726,0.08653,0.09623,0.10636,0.11669
-0.12726,0.13782,0.14871,0.15978,0.17117,0.18247,0.19368,0.20513,0.21663,0.22815,0.23978,0.25120,0.26278,0.27441,0.28610,0.29757,0.30919,0.32072,0.33224,0.34373
-0.35524,0.36645,0.37758,0.38872,0.39984,0.41100,0.42183,0.43250,0.44347,0.45427,0.46498,0.47554,0.48638,0.49699,0.50768,0.51816,0.52853,0.53877,0.54956,0.55995
-0.57013,0.58030,0.59040,0.60070,0.61097,0.62111,0.63106,0.64081,0.65066,0.66064,0.67039,0.68010,0.68992,0.69968,0.70917,0.71880,0.72834,0.73776,0.74722,0.75639
-0.76551,0.77446,0.78353,0.79254,0.80145,0.81018,0.81920,0.82792,0.83649,0.84500,0.85334,0.86163,0.86987,0.87789,0.88560,0.89317,0.90061,0.90782,0.91492,0.92154
-0.92761,0.93357,0.93902,0.94419,0.94896,0.95354,0.95767,0.96144,0.96481,0.96792,0.97078,0.97340,0.97584,0.97790,0.97970,0.98148,0.98305,0.98440,0.98572,0.98696
-0.98810,0.98923,0.99022,0.99102,0.99188,0.99260,0.99325,0.99388,0.99449,0.99499,0.99546,0.99589,0.99626,0.99663,0.99695,0.99726,0.99751,0.99777,0.99803,0.99821
-0.99838,0.99855,0.99869,0.99880,0.99891,0.99901,0.99910,0.99917,0.99926,0.99935,0.99942,0.99947,0.99953,0.99958,0.99962,0.99965,0.99969,0.99971,0.99975,0.99976
-0.99978,0.99980,0.99982,0.99983,0.99985,0.99986,0.99987,0.99988,0.99990,0.99990,0.99992,0.99992,0.99993,0.99994,0.99994,0.99995,0.99996,0.99996,0.99997,0.99997
+hwc1u1fract=0.00040,0.00104,0.00214,0.00379,0.00622,0.00949,0.01384,0.01917,0.02561,0.03267,0.04018,0.04832,0.05711,0.06642,0.07622,0.08592,0.09612,0.10635,0.11733
+0.12836,0.13914,0.15047,0.16176,0.17342,0.18460,0.19569,0.20756,0.21865,0.22998,0.24181,0.25310,0.26412,0.27574,0.28697,0.29817,0.30940,0.32068,0.33181,0.34336
+0.35469,0.36567,0.37724,0.38840,0.40002,0.41059,0.42152,0.43243,0.44384,0.45444,0.46540,0.47634,0.48780,0.49852,0.50969,0.52027,0.53033,0.54082,0.55083,0.56115
+0.57175,0.58225,0.59268,0.60319,0.61418,0.62427,0.63467,0.64475,0.65468,0.66490,0.67471,0.68466,0.69426,0.70406,0.71361,0.72338,0.73275,0.74217,0.75166,0.76061
+0.77053,0.77963,0.78847,0.79750,0.80697,0.81607,0.82518,0.83391,0.84231,0.85099,0.85938,0.86765,0.87598,0.88444,0.89210,0.89960,0.90760,0.91515,0.92212,0.92850
+0.93481,0.94075,0.94620,0.95157,0.95615,0.96064,0.96468,0.96819,0.97151,0.97447,0.97710,0.97950,0.98162,0.98336,0.98512,0.98680,0.98818,0.98942,0.99049,0.99162
+0.99245,0.99306,0.99373,0.99435,0.99501,0.99572,0.99611,0.99654,0.99708,0.99748,0.99773,0.99801,0.99826,0.99846,0.99858,0.99869,0.99884,0.99897,0.99909,0.99921
+0.99930,0.99936,0.99946,0.99951,0.99956,0.99959,0.99965,0.99971,0.99975,0.99978,0.99980,0.99981,0.99984,0.99986,0.99986,0.99986,0.99989,0.99989,0.99991,0.99991
+0.99992,0.99993,0.99993,0.99996,0.99996,0.99996,0.99996,0.99996,0.99997,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999
+0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+hwc1u2fract=0.00030,0.00076,0.00147,0.00276,0.00474,0.00771,0.01149,0.01631,0.02227,0.02910,0.03643,0.04422,0.05276,0.06195,0.07093,0.08071,0.09056,0.10068,0.11116
+0.12198,0.13287,0.14409,0.15508,0.16631,0.17712,0.18800,0.19937,0.21006,0.22088,0.23168,0.24293,0.25350,0.26490,0.27645,0.28776,0.29885,0.30978,0.32100,0.33236
+0.34376,0.35461,0.36551,0.37605,0.38688,0.39794,0.40883,0.41948,0.43007,0.44118,0.45194,0.46235,0.47315,0.48457,0.49529,0.50610,0.51668,0.52722,0.53789,0.54844
+0.55863,0.56904,0.57918,0.58957,0.59972,0.61036,0.62024,0.63064,0.64068,0.65036,0.66046,0.67050,0.68023,0.68992,0.70030,0.71013,0.71942,0.72939,0.73831,0.74768
+0.75705,0.76674,0.77576,0.78493,0.79425,0.80320,0.81215,0.82117,0.83011,0.83916,0.84746,0.85631,0.86495,0.87335,0.88140,0.88978,0.89789,0.90545,0.91260,0.92010
+0.92746,0.93396,0.94066,0.94658,0.95222,0.95727,0.96208,0.96625,0.97010,0.97384,0.97708,0.97991,0.98242,0.98476,0.98659,0.98825,0.98972,0.99114,0.99231,0.99333
+0.99411,0.99482,0.99542,0.99610,0.99673,0.99715,0.99751,0.99787,0.99816,0.99840,0.99862,0.99882,0.99899,0.99913,0.99926,0.99936,0.99946,0.99955,0.99961,0.99963
+0.99966,0.99971,0.99972,0.99972,0.99973,0.99977,0.99980,0.99981,0.99985,0.99985,0.99986,0.99988,0.99988,0.99990,0.99993,0.99993,0.99994,0.99996,0.99996,0.99998
+0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000
+1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+hwc1x1fract=0.00039,0.00089,0.00186,0.00341,0.00595,0.00944,0.01388,0.01947,0.02603,0.03366,0.04134,0.04986,0.05889,0.06806,0.07839,0.08846,0.09906,0.10936,0.12072
+0.13153,0.14257,0.15376,0.16571,0.17693,0.18772,0.19923,0.21064,0.22243,0.23429,0.24576,0.25680,0.26793,0.27916,0.29054,0.30165,0.31279,0.32394,0.33514,0.34646
+0.35747,0.36844,0.37957,0.39065,0.40186,0.41327,0.42448,0.43485,0.44533,0.45568,0.46611,0.47689,0.48744,0.49804,0.50864,0.51918,0.52993,0.54064,0.55090,0.56166
+0.57203,0.58211,0.59265,0.60265,0.61293,0.62313,0.63358,0.64378,0.65373,0.66412,0.67426,0.68454,0.69424,0.70378,0.71362,0.72334,0.73232,0.74113,0.75020,0.75974
+0.76920,0.77838,0.78780,0.79727,0.80642,0.81516,0.82429,0.83283,0.84141,0.85001,0.85817,0.86654,0.87480,0.88306,0.89073,0.89838,0.90603,0.91331,0.92090,0.92795
+0.93430,0.93999,0.94553,0.95073,0.95558,0.96009,0.96436,0.96797,0.97125,0.97423,0.97680,0.97924,0.98146,0.98358,0.98513,0.98664,0.98804,0.98923,0.99030,0.99132
+0.99225,0.99308,0.99381,0.99439,0.99497,0.99540,0.99582,0.99627,0.99667,0.99701,0.99736,0.99769,0.99800,0.99818,0.99837,0.99849,0.99861,0.99873,0.99890,0.99900
+0.99906,0.99916,0.99924,0.99931,0.99939,0.99945,0.99951,0.99954,0.99958,0.99960,0.99963,0.99968,0.99972,0.99974,0.99977,0.99978,0.99980,0.99980,0.99980,0.99982
+0.99984,0.99986,0.99987,0.99987,0.99988,0.99988,0.99989,0.99989,0.99990,0.99991,0.99991,0.99992,0.99992,0.99994,0.99994,0.99995,0.99995,0.99995,0.99996,0.99997
0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000
-hwc2x2fract=0.00063,0.00174,0.00342,0.00592,0.00925,0.01329,0.01815,0.02381,0.03008,0.03682,0.04436,0.05249,0.06109,0.07006,0.07951,0.08937,0.09959,0.11011,0.12073
-0.13153,0.14244,0.15380,0.16521,0.17671,0.18840,0.19992,0.21173,0.22321,0.23475,0.24637,0.25770,0.26909,0.28048,0.29197,0.30323,0.31448,0.32579,0.33683,0.34799
-0.35905,0.36993,0.38088,0.39195,0.40294,0.41394,0.42472,0.43552,0.44615,0.45695,0.46758,0.47830,0.48893,0.49948,0.51023,0.52082,0.53107,0.54156,0.55208,0.56250
-0.57260,0.58281,0.59289,0.60331,0.61340,0.62353,0.63351,0.64356,0.65385,0.66369,0.67351,0.68328,0.69308,0.70265,0.71225,0.72186,0.73142,0.74080,0.75002,0.75938
-0.76844,0.77758,0.78668,0.79547,0.80441,0.81328,0.82186,0.83064,0.83922,0.84768,0.85616,0.86459,0.87265,0.88064,0.88856,0.89625,0.90351,0.91062,0.91765,0.92433
-0.93056,0.93643,0.94186,0.94703,0.95197,0.95636,0.96055,0.96421,0.96758,0.97070,0.97350,0.97599,0.97830,0.98040,0.98232,0.98415,0.98574,0.98719,0.98849,0.98964
-0.99065,0.99154,0.99237,0.99314,0.99388,0.99448,0.99506,0.99553,0.99596,0.99636,0.99674,0.99706,0.99737,0.99766,0.99789,0.99809,0.99828,0.99846,0.99863,0.99877
-0.99889,0.99900,0.99911,0.99920,0.99930,0.99939,0.99945,0.99949,0.99954,0.99957,0.99960,0.99964,0.99968,0.99970,0.99972,0.99975,0.99977,0.99978,0.99981,0.99982
-0.99983,0.99985,0.99986,0.99987,0.99988,0.99989,0.99990,0.99990,0.99991,0.99992,0.99992,0.99993,0.99993,0.99994,0.99994,0.99994,0.99995,0.99995,0.99996,0.99996
-0.99997,0.99997,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000
-hwc2x1fract=0.00067,0.00176,0.00340,0.00574,0.00891,0.01268,0.01717,0.02235,0.02822,0.03471,0.04183,0.04945,0.05751,0.06605,0.07511,0.08455,0.09419,0.10420,0.11449
-0.12520,0.13596,0.14712,0.15840,0.16955,0.18106,0.19249,0.20426,0.21587,0.22755,0.23904,0.25087,0.26245,0.27395,0.28570,0.29732,0.30913,0.32040,0.33186,0.34318
-0.35468,0.36617,0.37723,0.38819,0.39939,0.41068,0.42173,0.43281,0.44371,0.45490,0.46562,0.47659,0.48728,0.49777,0.50848,0.51902,0.52975,0.54018,0.55083,0.56122
-0.57145,0.58169,0.59194,0.60207,0.61221,0.62250,0.63278,0.64275,0.65268,0.66246,0.67245,0.68222,0.69193,0.70145,0.71112,0.72073,0.73006,0.73932,0.74860,0.75806
-0.76732,0.77652,0.78566,0.79468,0.80349,0.81225,0.82100,0.82990,0.83863,0.84717,0.85578,0.86412,0.87237,0.88033,0.88813,0.89583,0.90324,0.91053,0.91735,0.92396
-0.93034,0.93627,0.94178,0.94698,0.95186,0.95638,0.96044,0.96409,0.96744,0.97060,0.97341,0.97595,0.97825,0.98025,0.98226,0.98401,0.98555,0.98691,0.98814,0.98936
-0.99046,0.99136,0.99227,0.99302,0.99375,0.99441,0.99500,0.99548,0.99598,0.99639,0.99678,0.99709,0.99736,0.99762,0.99786,0.99806,0.99828,0.99846,0.99859,0.99873
-0.99884,0.99895,0.99905,0.99914,0.99922,0.99930,0.99937,0.99943,0.99949,0.99954,0.99958,0.99962,0.99966,0.99969,0.99971,0.99974,0.99977,0.99979,0.99981,0.99982
-0.99983,0.99985,0.99986,0.99987,0.99988,0.99988,0.99989,0.99990,0.99991,0.99991,0.99992,0.99993,0.99993,0.99994,0.99995,0.99995,0.99996,0.99997,0.99997,0.99997
-0.99998,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000
-hwc2u2fract=0.00087,0.00196,0.00358,0.00573,0.00840,0.01171,0.01562,0.01998,0.02492,0.03051,0.03640,0.04250,0.04920,0.05625,0.06356,0.07127,0.07937,0.08758,0.09644
-0.10545,0.11485,0.12449,0.13421,0.14402,0.15410,0.16447,0.17496,0.18547,0.19626,0.20710,0.21815,0.22910,0.24033,0.25140,0.26240,0.27361,0.28491,0.29600,0.30703
-0.31808,0.32913,0.34036,0.35151,0.36274,0.37385,0.38499,0.39599,0.40694,0.41794,0.42907,0.44003,0.45101,0.46180,0.47271,0.48330,0.49404,0.50462,0.51506,0.52574
-0.53639,0.54691,0.55740,0.56774,0.57840,0.58886,0.59907,0.60916,0.61933,0.62962,0.63976,0.64991,0.65997,0.67006,0.67991,0.68974,0.69949,0.70901,0.71877,0.72850
-0.73813,0.74797,0.75730,0.76663,0.77589,0.78491,0.79397,0.80301,0.81173,0.82051,0.82935,0.83785,0.84616,0.85421,0.86241,0.87060,0.87814,0.88578,0.89306,0.90002
-0.90690,0.91343,0.91962,0.92546,0.93096,0.93625,0.94115,0.94565,0.94999,0.95402,0.95762,0.96103,0.96431,0.96731,0.97011,0.97268,0.97499,0.97720,0.97920,0.98109
-0.98275,0.98424,0.98566,0.98708,0.98832,0.98939,0.99046,0.99135,0.99217,0.99288,0.99361,0.99421,0.99475,0.99525,0.99576,0.99615,0.99652,0.99686,0.99718,0.99748
-0.99775,0.99799,0.99820,0.99838,0.99853,0.99868,0.99881,0.99894,0.99903,0.99914,0.99922,0.99930,0.99939,0.99945,0.99951,0.99955,0.99960,0.99964,0.99969,0.99971
-0.99974,0.99976,0.99979,0.99980,0.99983,0.99985,0.99986,0.99987,0.99988,0.99988,0.99989,0.99991,0.99992,0.99993,0.99994,0.99994,0.99995,0.99995,0.99995,0.99996
-0.99996,0.99997,0.99997,0.99997,0.99998,0.99998,0.99999,0.99999,1.00000,1.00000,1.00000
-hwc2u1fract=0.00051,0.00132,0.00268,0.00456,0.00723,0.01046,0.01443,0.01926,0.02451,0.03040,0.03680,0.04360,0.05098,0.05864,0.06690,0.07549,0.08446,0.09378,0.10338
-0.11323,0.12335,0.13398,0.14447,0.15533,0.16657,0.17780,0.18898,0.20042,0.21188,0.22350,0.23516,0.24701,0.25885,0.27070,0.28245,0.29433,0.30591,0.31759,0.32924
-0.34099,0.35236,0.36398,0.37555,0.38711,0.39816,0.40942,0.42071,0.43193,0.44311,0.45411,0.46509,0.47590,0.48678,0.49754,0.50829,0.51896,0.52971,0.54060,0.55117
-0.56159,0.57180,0.58226,0.59295,0.60304,0.61314,0.62341,0.63359,0.64384,0.65375,0.66362,0.67356,0.68338,0.69317,0.70299,0.71266,0.72239,0.73187,0.74152,0.75091
-0.76021,0.76963,0.77883,0.78777,0.79687,0.80585,0.81478,0.82364,0.83257,0.84107,0.84980,0.85828,0.86633,0.87455,0.88262,0.89032,0.89780,0.90521,0.91218,0.91892
-0.92558,0.93162,0.93706,0.94252,0.94755,0.95208,0.95624,0.96009,0.96372,0.96691,0.96984,0.97252,0.97488,0.97711,0.97920,0.98101,0.98263,0.98408,0.98546,0.98671
-0.98790,0.98897,0.98998,0.99094,0.99173,0.99248,0.99320,0.99380,0.99443,0.99496,0.99543,0.99591,0.99631,0.99667,0.99699,0.99724,0.99751,0.99777,0.99798,0.99819
-0.99836,0.99855,0.99867,0.99880,0.99892,0.99902,0.99913,0.99923,0.99929,0.99937,0.99943,0.99949,0.99954,0.99958,0.99963,0.99966,0.99970,0.99974,0.99977,0.99979
-0.99981,0.99982,0.99984,0.99985,0.99986,0.99987,0.99988,0.99989,0.99991,0.99991,0.99992,0.99993,0.99993,0.99994,0.99994,0.99994,0.99995,0.99996,0.99997,0.99997
-0.99997,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000
+hwc1x2fract=0.00034,0.00091,0.00192,0.00386,0.00642,0.01038,0.01512,0.02090,0.02742,0.03458,0.04237,0.05108,0.06011,0.06908,0.07907,0.08859,0.09877,0.10957,0.12075
+0.13167,0.14228,0.15351,0.16477,0.17614,0.18734,0.19846,0.21003,0.22140,0.23282,0.24396,0.25576,0.26750,0.27869,0.29028,0.30146,0.31272,0.32367,0.33493,0.34568
+0.35649,0.36713,0.37825,0.38910,0.40003,0.41068,0.42154,0.43297,0.44353,0.45426,0.46531,0.47589,0.48663,0.49719,0.50747,0.51824,0.52880,0.53915,0.54960,0.55988
+0.57007,0.58042,0.59086,0.60078,0.61072,0.62136,0.63162,0.64136,0.65165,0.66153,0.67179,0.68125,0.69173,0.70131,0.71100,0.72041,0.72984,0.73942,0.74891,0.75833
+0.76796,0.77699,0.78597,0.79497,0.80389,0.81285,0.82172,0.83070,0.83993,0.84842,0.85680,0.86534,0.87323,0.88164,0.89002,0.89801,0.90596,0.91330,0.92060,0.92758
+0.93430,0.94006,0.94625,0.95173,0.95700,0.96162,0.96581,0.96940,0.97269,0.97576,0.97865,0.98088,0.98301,0.98507,0.98695,0.98838,0.98967,0.99089,0.99190,0.99307
+0.99379,0.99448,0.99520,0.99580,0.99637,0.99678,0.99718,0.99749,0.99776,0.99797,0.99815,0.99830,0.99848,0.99863,0.99878,0.99893,0.99902,0.99912,0.99919,0.99926
+0.99933,0.99939,0.99943,0.99948,0.99951,0.99956,0.99960,0.99965,0.99966,0.99966,0.99968,0.99970,0.99972,0.99973,0.99975,0.99975,0.99977,0.99979,0.99980,0.99980
+0.99981,0.99983,0.99983,0.99984,0.99985,0.99985,0.99987,0.99988,0.99988,0.99990,0.99990,0.99991,0.99992,0.99993,0.99993,0.99993,0.99993,0.99993,0.99993,0.99994
+0.99995,0.99996,0.99996,0.99997,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,1.00000
+hwc1v2fract=0.00029,0.00070,0.00134,0.00236,0.00409,0.00670,0.01026,0.01541,0.02091,0.02757,0.03481,0.04312,0.05186,0.06147,0.07093,0.08045,0.09062,0.10065,0.11089
+0.12160,0.13273,0.14374,0.15457,0.16563,0.17693,0.18749,0.19828,0.20983,0.22116,0.23189,0.24314,0.25469,0.26573,0.27647,0.28728,0.29874,0.30974,0.32123,0.33210
+0.34294,0.35394,0.36510,0.37637,0.38728,0.39783,0.40905,0.41997,0.43109,0.44158,0.45222,0.46277,0.47363,0.48461,0.49532,0.50592,0.51687,0.52752,0.53750,0.54761
+0.55760,0.56787,0.57780,0.58799,0.59801,0.60845,0.61852,0.62871,0.63877,0.64887,0.65891,0.66866,0.67897,0.68874,0.69874,0.70829,0.71791,0.72703,0.73658,0.74614
+0.75542,0.76483,0.77428,0.78384,0.79273,0.80175,0.81075,0.81965,0.82817,0.83665,0.84538,0.85411,0.86210,0.86996,0.87787,0.88594,0.89389,0.90158,0.90898,0.91610
+0.92298,0.92972,0.93575,0.94151,0.94703,0.95197,0.95653,0.96100,0.96475,0.96831,0.97163,0.97465,0.97713,0.97929,0.98171,0.98367,0.98532,0.98702,0.98829,0.98957
+0.99069,0.99165,0.99255,0.99330,0.99404,0.99468,0.99518,0.99567,0.99611,0.99656,0.99689,0.99721,0.99752,0.99782,0.99804,0.99830,0.99854,0.99869,0.99882,0.99891
+0.99904,0.99913,0.99926,0.99935,0.99943,0.99951,0.99953,0.99959,0.99964,0.99969,0.99972,0.99974,0.99977,0.99979,0.99982,0.99983,0.99985,0.99987,0.99989,0.99990
+0.99991,0.99991,0.99991,0.99992,0.99993,0.99993,0.99994,0.99995,0.99995,0.99996,0.99996,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999
+0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+hwc1v1fract=0.00020,0.00047,0.00117,0.00251,0.00460,0.00774,0.01199,0.01782,0.02474,0.03224,0.04035,0.04938,0.05830,0.06774,0.07787,0.08769,0.09793,0.10830,0.11907
+0.12957,0.14006,0.15059,0.16185,0.17238,0.18374,0.19493,0.20602,0.21756,0.22860,0.23975,0.25146,0.26256,0.27382,0.28485,0.29599,0.30751,0.31878,0.32968,0.34090
+0.35163,0.36246,0.37330,0.38416,0.39516,0.40607,0.41668,0.42725,0.43772,0.44833,0.45881,0.46949,0.48026,0.49090,0.50120,0.51172,0.52233,0.53253,0.54301,0.55321
+0.56375,0.57378,0.58378,0.59414,0.60452,0.61476,0.62493,0.63512,0.64579,0.65619,0.66592,0.67542,0.68539,0.69543,0.70519,0.71477,0.72419,0.73361,0.74286,0.75241
+0.76162,0.77106,0.78028,0.78968,0.79879,0.80792,0.81674,0.82580,0.83444,0.84281,0.85162,0.86001,0.86838,0.87654,0.88487,0.89312,0.90093,0.90842,0.91619,0.92322
+0.93008,0.93661,0.94278,0.94830,0.95339,0.95810,0.96278,0.96659,0.97009,0.97306,0.97589,0.97858,0.98081,0.98270,0.98437,0.98599,0.98740,0.98881,0.99004,0.99097
+0.99176,0.99254,0.99330,0.99405,0.99474,0.99524,0.99572,0.99619,0.99660,0.99699,0.99734,0.99766,0.99786,0.99804,0.99824,0.99846,0.99855,0.99872,0.99882,0.99893
+0.99907,0.99918,0.99926,0.99936,0.99946,0.99950,0.99957,0.99962,0.99964,0.99970,0.99973,0.99979,0.99980,0.99985,0.99987,0.99987,0.99991,0.99991,0.99992,0.99992
+0.99992,0.99993,0.99994,0.99994,0.99995,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,1.00000
+1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+hwc2v1fract=0.00044,0.00114,0.00220,0.00398,0.00649,0.01031,0.01485,0.02042,0.02682,0.03420,0.04218,0.05046,0.05916,0.06766,0.07720,0.08732,0.09718,0.10763,0.11826
+0.12914,0.13978,0.15108,0.16210,0.17326,0.18519,0.19652,0.20802,0.21909,0.23030,0.24119,0.25278,0.26446,0.27549,0.28715,0.29799,0.30933,0.32080,0.33205,0.34314
+0.35427,0.36534,0.37609,0.38726,0.39806,0.40898,0.41995,0.43084,0.44202,0.45262,0.46358,0.47428,0.48484,0.49565,0.50643,0.51748,0.52827,0.53866,0.54930,0.55940
+0.56965,0.57984,0.59055,0.60075,0.61094,0.62110,0.63135,0.64203,0.65193,0.66202,0.67149,0.68139,0.69131,0.70078,0.71025,0.72036,0.73020,0.73963,0.74871,0.75814
+0.76759,0.77680,0.78581,0.79496,0.80363,0.81213,0.82090,0.83026,0.83886,0.84746,0.85621,0.86463,0.87277,0.88089,0.88867,0.89653,0.90387,0.91111,0.91800,0.92438
+0.93012,0.93629,0.94177,0.94669,0.95146,0.95584,0.96003,0.96374,0.96737,0.97035,0.97336,0.97595,0.97829,0.98040,0.98220,0.98395,0.98548,0.98694,0.98816,0.98939
+0.99036,0.99125,0.99206,0.99280,0.99348,0.99414,0.99473,0.99522,0.99563,0.99598,0.99637,0.99690,0.99716,0.99747,0.99778,0.99803,0.99826,0.99853,0.99868,0.99879
+0.99892,0.99907,0.99914,0.99925,0.99934,0.99940,0.99947,0.99954,0.99962,0.99964,0.99970,0.99971,0.99976,0.99978,0.99980,0.99982,0.99983,0.99983,0.99986,0.99989
+0.99990,0.99991,0.99993,0.99993,0.99994,0.99994,0.99995,0.99997,0.99997,0.99997,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999
+0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000
+hwc2v2fract=0.00023,0.00062,0.00140,0.00292,0.00518,0.00850,0.01241,0.01751,0.02336,0.03013,0.03744,0.04573,0.05391,0.06270,0.07193,0.08146,0.09156,0.10176,0.11212
+0.12287,0.13344,0.14464,0.15560,0.16681,0.17808,0.18893,0.20042,0.21229,0.22374,0.23565,0.24655,0.25793,0.26927,0.28069,0.29206,0.30327,0.31458,0.32601,0.33731
+0.34852,0.35935,0.37048,0.38146,0.39257,0.40396,0.41499,0.42639,0.43715,0.44825,0.45913,0.46976,0.48059,0.49156,0.50286,0.51335,0.52419,0.53458,0.54503,0.55528
+0.56610,0.57623,0.58669,0.59716,0.60720,0.61736,0.62752,0.63740,0.64739,0.65749,0.66768,0.67772,0.68731,0.69700,0.70629,0.71561,0.72490,0.73508,0.74471,0.75395
+0.76295,0.77234,0.78156,0.79042,0.79915,0.80838,0.81729,0.82598,0.83463,0.84347,0.85189,0.86015,0.86835,0.87681,0.88486,0.89265,0.90017,0.90749,0.91481,0.92150
+0.92797,0.93404,0.93998,0.94543,0.95038,0.95496,0.95916,0.96306,0.96639,0.96985,0.97286,0.97562,0.97774,0.97981,0.98161,0.98315,0.98480,0.98622,0.98770,0.98893
+0.99004,0.99111,0.99193,0.99274,0.99348,0.99413,0.99475,0.99527,0.99584,0.99631,0.99668,0.99710,0.99736,0.99771,0.99797,0.99824,0.99843,0.99859,0.99877,0.99892
+0.99906,0.99920,0.99928,0.99932,0.99943,0.99950,0.99957,0.99962,0.99964,0.99968,0.99973,0.99976,0.99979,0.99981,0.99983,0.99985,0.99986,0.99989,0.99989,0.99990
+0.99991,0.99992,0.99993,0.99994,0.99994,0.99996,0.99996,0.99996,0.99997,0.99997,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999
+0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+hwc2x2fract=0.00027,0.00093,0.00199,0.00379,0.00629,0.00973,0.01450,0.02019,0.02676,0.03383,0.04173,0.05031,0.05891,0.06867,0.07875,0.08900,0.09899,0.10966,0.12079
+0.13245,0.14435,0.15567,0.16687,0.17852,0.19026,0.20130,0.21264,0.22432,0.23534,0.24710,0.25883,0.27029,0.28180,0.29334,0.30386,0.31462,0.32548,0.33667,0.34839
+0.35938,0.37020,0.38105,0.39218,0.40300,0.41367,0.42424,0.43532,0.44628,0.45743,0.46811,0.47918,0.48990,0.50045,0.51076,0.52154,0.53225,0.54287,0.55396,0.56428
+0.57424,0.58476,0.59472,0.60512,0.61562,0.62543,0.63566,0.64558,0.65550,0.66600,0.67605,0.68576,0.69532,0.70506,0.71479,0.72423,0.73417,0.74341,0.75264,0.76193
+0.77098,0.77994,0.78915,0.79791,0.80687,0.81606,0.82485,0.83336,0.84207,0.85049,0.85919,0.86757,0.87613,0.88399,0.89186,0.89973,0.90724,0.91502,0.92184,0.92914
+0.93559,0.94131,0.94696,0.95193,0.95671,0.96087,0.96476,0.96853,0.97174,0.97466,0.97708,0.97965,0.98189,0.98378,0.98554,0.98706,0.98846,0.98976,0.99077,0.99173
+0.99250,0.99335,0.99402,0.99466,0.99524,0.99573,0.99623,0.99663,0.99698,0.99723,0.99757,0.99791,0.99815,0.99840,0.99857,0.99875,0.99888,0.99899,0.99909,0.99916
+0.99927,0.99931,0.99937,0.99943,0.99948,0.99952,0.99955,0.99957,0.99960,0.99963,0.99969,0.99971,0.99973,0.99974,0.99975,0.99977,0.99978,0.99980,0.99981,0.99983
+0.99983,0.99984,0.99985,0.99985,0.99987,0.99988,0.99990,0.99990,0.99991,0.99992,0.99992,0.99993,0.99993,0.99994,0.99994,0.99995,0.99996,0.99997,0.99998,0.99998
+0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+hwc2x1fract=0.00042,0.00105,0.00183,0.00348,0.00584,0.00953,0.01394,0.01901,0.02510,0.03194,0.03926,0.04756,0.05620,0.06545,0.07508,0.08496,0.09530,0.10588,0.11651
+0.12725,0.13819,0.14933,0.16047,0.17222,0.18375,0.19534,0.20652,0.21773,0.22940,0.24092,0.25219,0.26363,0.27493,0.28636,0.29765,0.30910,0.32002,0.33147,0.34231
+0.35323,0.36490,0.37610,0.38686,0.39812,0.40877,0.42006,0.43069,0.44131,0.45259,0.46410,0.47485,0.48523,0.49596,0.50675,0.51755,0.52845,0.53882,0.54941,0.55990
+0.56992,0.58052,0.59132,0.60184,0.61211,0.62274,0.63319,0.64322,0.65363,0.66356,0.67349,0.68321,0.69297,0.70347,0.71353,0.72315,0.73272,0.74162,0.75161,0.76079
+0.77004,0.77890,0.78812,0.79752,0.80592,0.81460,0.82333,0.83208,0.84103,0.84961,0.85851,0.86723,0.87563,0.88384,0.89232,0.89979,0.90731,0.91449,0.92123,0.92820
+0.93431,0.94049,0.94603,0.95108,0.95546,0.95979,0.96410,0.96774,0.97099,0.97384,0.97629,0.97880,0.98083,0.98280,0.98456,0.98624,0.98779,0.98909,0.99045,0.99139
+0.99231,0.99313,0.99388,0.99454,0.99511,0.99562,0.99614,0.99665,0.99698,0.99729,0.99757,0.99784,0.99810,0.99832,0.99853,0.99871,0.99885,0.99894,0.99905,0.99913
+0.99922,0.99929,0.99937,0.99943,0.99950,0.99957,0.99959,0.99962,0.99964,0.99965,0.99968,0.99971,0.99973,0.99976,0.99978,0.99980,0.99980,0.99981,0.99982,0.99982
+0.99983,0.99983,0.99985,0.99987,0.99988,0.99988,0.99990,0.99990,0.99990,0.99990,0.99990,0.99990,0.99990,0.99991,0.99991,0.99992,0.99992,0.99993,0.99993,0.99994
+0.99995,0.99995,0.99995,0.99995,0.99996,0.99997,0.99998,0.99999,1.00000,1.00000,1.00000
+hwc2u2fract=0.00026,0.00066,0.00127,0.00228,0.00379,0.00608,0.00921,0.01332,0.01852,0.02513,0.03242,0.03987,0.04826,0.05677,0.06600,0.07541,0.08440,0.09388,0.10341
+0.11338,0.12389,0.13473,0.14547,0.15614,0.16668,0.17726,0.18828,0.19987,0.21074,0.22200,0.23282,0.24421,0.25573,0.26742,0.27830,0.28914,0.30078,0.31175,0.32290
+0.33384,0.34452,0.35591,0.36680,0.37720,0.38788,0.39905,0.40994,0.42095,0.43218,0.44297,0.45345,0.46439,0.47494,0.48536,0.49609,0.50692,0.51766,0.52831,0.53877
+0.54936,0.56007,0.57088,0.58080,0.59110,0.60123,0.61151,0.62174,0.63216,0.64152,0.65115,0.66155,0.67181,0.68164,0.69202,0.70135,0.71144,0.72115,0.73022,0.73963
+0.74956,0.75890,0.76841,0.77793,0.78697,0.79598,0.80503,0.81379,0.82289,0.83146,0.84055,0.84896,0.85748,0.86574,0.87378,0.88145,0.88988,0.89803,0.90514,0.91257
+0.91950,0.92598,0.93223,0.93825,0.94419,0.94950,0.95432,0.95862,0.96292,0.96645,0.96969,0.97285,0.97524,0.97749,0.97991,0.98184,0.98364,0.98506,0.98636,0.98774
+0.98889,0.98992,0.99078,0.99170,0.99240,0.99317,0.99379,0.99441,0.99492,0.99551,0.99609,0.99650,0.99689,0.99719,0.99754,0.99780,0.99801,0.99824,0.99847,0.99863
+0.99879,0.99892,0.99907,0.99920,0.99927,0.99939,0.99945,0.99950,0.99958,0.99960,0.99965,0.99967,0.99972,0.99974,0.99979,0.99982,0.99985,0.99985,0.99989,0.99991
+0.99993,0.99994,0.99994,0.99995,0.99997,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
+hwc2u1fract=0.00022,0.00056,0.00115,0.00246,0.00428,0.00689,0.01018,0.01444,0.01956,0.02559,0.03214,0.03961,0.04745,0.05565,0.06452,0.07301,0.08243,0.09246,0.10247
+0.11273,0.12335,0.13432,0.14583,0.15700,0.16870,0.17961,0.19060,0.20215,0.21412,0.22513,0.23640,0.24784,0.25922,0.27074,0.28198,0.29370,0.30539,0.31711,0.32876
+0.33991,0.35164,0.36309,0.37433,0.38544,0.39633,0.40765,0.41836,0.42916,0.43985,0.45060,0.46170,0.47281,0.48353,0.49450,0.50496,0.51596,0.52655,0.53718,0.54783
+0.55860,0.56938,0.58006,0.59096,0.60111,0.61077,0.62160,0.63136,0.64184,0.65170,0.66165,0.67151,0.68118,0.69139,0.70129,0.71113,0.72122,0.73096,0.74020,0.74986
+0.75999,0.76934,0.77924,0.78854,0.79825,0.80745,0.81678,0.82559,0.83459,0.84329,0.85160,0.86029,0.86851,0.87670,0.88479,0.89238,0.89971,0.90686,0.91369,0.92045
+0.92671,0.93308,0.93888,0.94399,0.94916,0.95398,0.95811,0.96190,0.96547,0.96878,0.97162,0.97419,0.97679,0.97907,0.98099,0.98281,0.98444,0.98592,0.98739,0.98852
+0.98971,0.99066,0.99144,0.99225,0.99312,0.99381,0.99450,0.99505,0.99556,0.99604,0.99650,0.99683,0.99722,0.99749,0.99776,0.99797,0.99822,0.99840,0.99863,0.99881
+0.99896,0.99908,0.99918,0.99928,0.99938,0.99946,0.99952,0.99957,0.99965,0.99969,0.99971,0.99974,0.99978,0.99981,0.99983,0.99985,0.99986,0.99987,0.99989,0.99989
+0.99990,0.99990,0.99990,0.99991,0.99992,0.99993,0.99994,0.99994,0.99995,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999
+0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000
diff --git a/PARAM/HMS/DC/hdc_cuts.param b/PARAM/HMS/DC/hdc_cuts.param
index a112653ecacc9f38517d4604bd723837dff58eb5..36b60357d6317fb86333730bbd1cd0648f93b867 100644
--- a/PARAM/HMS/DC/hdc_cuts.param
+++ b/PARAM/HMS/DC/hdc_cuts.param
@@ -9,10 +9,10 @@ hsel_using_scin = 0
; TDC window limits for each plane.
-hdc_tdc_min_win = -30000, -30000, -30000, -30000, -30000, -30000
- -30000, -30000, -30000, -30000, -30000, -30000
-hdc_tdc_max_win = 30000, 30000, 30000, 30000, 30000, 30000
- 30000, 30000, 30000, 30000, 30000, 30000
+hdc_tdc_min_win = -14000, -14000, -14000, -14000, -14000, -14000
+ -14000, -14000, -14000, -14000, -14000, -14000
+hdc_tdc_max_win = -11000, -11000, -11000, -11000, -11000, -11000
+ -11000, -11000, -11000, -11000, -11000, -11000
hdc_fix_lr = 1 ; Let hit have different L/R assignment for different space point
hdc_fix_propcorr = 1 ; do propagation along wire each time hit appeears
@@ -20,5 +20,5 @@ hdc_fix_propcorr = 1 ; do propagation along wire each time hit appeears
; Zero time correction for each plane in ns that is added to TDC time.
- hdc_plane_time_zero = 1366.0,1366.0,1366.0,1366.0,1366.0,1366.0,
- 1366.0,1366.0,1366.0,1366.0,1366.0,1366.0
+ hdc_plane_time_zero = 1316.0+45.,1316.0+45.,1316.0+45.,1316.0+45.,1316.0+45.,1316.0+45.,
+ 1316.0+45.,1316.0+45.,1316.0+45.,1316.0+45.,1316.0+45.,1316.0+45.
diff --git a/PARAM/HMS/DC/hdc_tzero_per_wire.param b/PARAM/HMS/DC/hdc_tzero_per_wire.param
index a34d8474364706d7d125279360a019dbbcb66a8d..2c6ac4d807aa24efb30e8f5933972cac518d0dc2 100644
--- a/PARAM/HMS/DC/hdc_tzero_per_wire.param
+++ b/PARAM/HMS/DC/hdc_tzero_per_wire.param
@@ -1,88 +1,88 @@
htzero1u1=
--27.9982,-27.998165,-27.998165,-27.998165,-27.998165,-27.998165,-27.998165,-27.998165,-27.998165,-27.998165,-27.998165,-27.998165, -27.998165, -27.998165, -27.998165, -27.998165
--29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551, -29.812551
--33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684, -33.931684
--33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354, -33.070354
--35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834, -35.650834
-93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428, 93.262428
+-0.440464,-0.440464,-0.440464,-0.440464,-0.440464,-0.440464,-0.440464,-0.440464,-0.440464,-0.440464,-0.440464,-0.440464, -0.440464, -0.440464, -0.440464, -0.440464
+-0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, 4.458522, 4.487117, 4.184051, 0.510218, 1.566245, 2.530239, 2.513408, 1.602991, 2.030967, 2.698696
+-0.597890, -0.278387, -2.348171, 0.460231, -2.572141, -2.251707, 1.428088, -1.750477, 0.099636, 0.444034, -2.259635, -0.642666, 0.614114, -0.851486, 0.845989, 0.559213
+0.721416, -0.389090, -0.426358, -2.641039, -0.316464, -2.266126, 0.904561, 0.502839, -0.665667, 0.498546, -0.856515, 1.223263, 0.755352, 1.079768, 1.941412, 1.162839
+-0.112275, 0.213580, -0.940007, 0.019292, -3.354514, -0.052470, -1.886110, -2.538166, -0.481267, -0.586367, 0.181511, -0.070307, -2.262675, -0.440464, -0.440464, -0.440464
+-0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464, -0.440464
htzero1u2=
--22.918161,-22.918161,-22.918161,-22.918161,-22.918161,-22.918161,-22.918161,-22.918161,-22.918161,-22.918161,-22.918161,-22.918161, -22.918161, -22.918161, -22.918161, -22.918161
--25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927, -25.187927
--25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482, -25.011482
--30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997, -30.442997
--33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025, -33.148025
--33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816, -33.122816
+0.024980,0.024980,0.024980,0.024980,0.024980,0.024980,0.024980,0.024980,0.024980,0.024980,0.024980,0.024980, 0.024980, 0.024980, 0.024980, 0.024980
+0.024980, 0.024980, 0.024980, 6.315195, 9.119130, 9.750886, 9.191310, 10.016245, 6.396322, 9.854352, 8.069421, 9.200274, 11.910925, 7.548432, 6.764622, 8.412698
+4.331099, 6.294720, 4.757038, 4.994655, 5.849832, 5.648945, 1.585668, 7.999644, 2.355703, 7.014282, 5.477305, 7.316057, 7.108955, 6.906024, 8.623743, 7.095219
+-1.312339, -2.561633, 1.226556, -2.066228, 1.869677, 0.350637, -0.538920, -2.923530, 1.615048, -2.136310, 4.285659, -0.420092, 2.766439, 0.037120, 1.533689, 0.160452
+-1.190286, 1.128375, 1.807601, 1.952180, 1.918856, 3.534836, 2.635758, 2.080510, 1.088712, 4.434154, 1.954392, 1.345678, 0.024980, 0.024980, 0.024980, 0.024980
+0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980, 0.024980
htzero1x1=
--27.345426,-27.345426,-27.345426,-27.345426,-27.345426,-27.345426,-27.345426,-27.345426,-27.345426,-27.345426,-27.345426,-32.333943, -32.333943, -32.333943, -32.333943, -32.333943
--32.333943, -32.333943, -32.333943, -32.333943, -32.333943, -32.333943, -32.333943, -32.333943, -32.333943, -32.333943, -32.333943, -27.001785, -27.001785, -27.001785, -27.001785, -27.001785
--27.001785, -27.001785, -27.001785, -27.001785, -27.001785, -27.001785, -27.001785, -27.001785, -27.001785, -27.001785, -27.001785, -34.207230, -34.207230, -34.207230, -34.207230, -34.207230
--34.207230, -34.207230, -34.207230, -34.207230, -34.207230, -34.207230, -34.207230, -34.207230, -34.207230, -34.207230, -34.207230, -35.005787, -35.005787, -35.005787, -35.005787, -35.005787
--35.005787, -35.005787, -35.005787, -35.005787, -35.005787, -35.005787, -35.005787, -35.005787, -35.005787, -35.005787, -35.005787, -34.490565, -34.490565, -34.490565, -34.490565, -34.490565
--34.490565, -34.490565, -34.490565, -34.490565, -34.490565, -34.490565, -34.490565, -34.490565, -34.490565, -34.490565, -34.490565, -33.566746, -33.566746, -33.566746, -33.566746, -33.566746
--33.566746, -33.566746, -33.566746, -33.566746, -33.566746, -33.566746
+-0.169242,-0.169242,-0.169242,-0.169242,-0.169242,-0.169242,-0.169242,-0.169242,-0.169242,-0.169242,-0.169242,-2.989358, 2.432882, -2.528518, 0.803814, -2.346012
+0.492928, -1.901662, -1.764362, -0.813093, -2.071887, -2.716131, -0.842558, 0.828597, -0.709158, -1.790519, -2.530321, 8.614355, 7.566560, 7.251610, 6.927087, 8.341808
+6.926635, 6.715836, 6.813193, 6.970206, 7.914009, 8.373448, 6.665460, 3.473153, 7.029110, 7.902263, 7.387555, -0.001848, 0.841693, -0.603023, -2.502659, -1.166564
+-1.348077, -1.420331, -2.270599, -1.172546, -0.840479, -2.238364, -1.104627, 0.557855, -0.847257, 2.446533, -1.673718, 3.718706, -0.370846, -0.270825, -2.795021, 0.183510
+-1.743785, -1.627596, -0.024721, 0.584422, -1.529224, -2.006668, -0.570577, -1.031228, -0.430024, -1.070615, -2.016040, -2.119741, 0.524855, 0.152800, -1.206025, 1.540995
+-1.830360, -1.217124, -2.481159, -0.749956, 0.292741, 0.715709, 1.381069, 1.500037, 2.065981, 2.083577, 1.197517, -1.749409, -0.169242, -0.169242, -0.169242, -0.169242
+-0.169242, -0.169242, -0.169242, -0.169242, -0.169242, -0.169242
htzero1x2=
--35.012421,-35.012421,-35.012421,-35.012421,-35.012421,-35.012421,-35.012421,-35.012421,-35.012421,-35.012421,-35.012421,-33.379909, -33.379909, -33.379909, -33.379909, -33.379909
--33.379909, -33.379909, -33.379909, -33.379909, -33.379909, -33.379909, -33.379909, -33.379909, -33.379909, -33.379909, -33.379909, -35.128467, -35.128467, -35.128467, -35.128467, -35.128467
--35.128467, -35.128467, -35.128467, -35.128467, -35.128467, -35.128467, -35.128467, -35.128467, -35.128467, -35.128467, -35.128467, -33.770476, -33.770476, -33.770476, -33.770476, -33.770476
--33.770476, -33.770476, -33.770476, -33.770476, -33.770476, -33.770476, -33.770476, -33.770476, -33.770476, -33.770476, -33.770476, -32.314305, -32.314305, -32.314305, -32.314305, -32.314305
--32.314305, -32.314305, -32.314305, -32.314305, -32.314305, -32.314305, -32.314305, -32.314305, -32.314305, -32.314305, -32.314305, -31.910701, -31.910701, -31.910701, -31.910701, -31.910701
--31.910701, -31.910701, -31.910701, -31.910701, -31.910701, -31.910701, -31.910701, -31.910701, -31.910701, -31.910701, -31.910701, -23.347409, -23.347409, -23.347409, -23.347409, -23.347409
--23.347409, -23.347409, -23.347409, -23.347409, -23.347409, -23.347409
+-0.235844,-0.235844,-0.235844,-0.235844,-0.235844,-0.235844,-0.235844,-0.235844,-0.235844,-0.235844,-0.235844,1.586471, 1.077968, 1.412710, 0.994433, -0.035210
+-1.635911, 2.381344, 0.692655, 1.123994, -1.757121, -3.151641, 1.154837, 2.028185, 1.212885, 0.528955, -1.092334, -0.383852, -0.221939, 0.027536, 0.840442, 0.006755
+-0.311012, -1.204746, -0.606976, -1.337707, -1.375940, -2.918894, -2.162612, -2.471173, -1.155978, -0.075556, -3.113703, 3.027615, 0.689830, 2.237074, 0.785113, -0.079452
+0.065655, 0.335119, -1.123420, -0.703251, 0.561194, -2.284563, 0.377548, -0.603996, -1.272606, -1.001367, 0.383185, -2.819655, 0.464777, -2.935831, 0.387659, -2.319501
+-0.127006, -0.097918, 0.161551, -1.386519, 0.577773, -1.804469, -1.680045, 0.723331, 0.223969, -0.094461, 1.810657, 0.310038, 1.866069, 0.217834, 2.038456, 0.816901
+0.447306, 0.501606, -1.558409, 0.739037, 0.476719, 0.361086, -1.821962, 1.507067, -0.554804, -0.235844, -0.235844, -0.235844, -0.235844, -0.235844, -0.235844, -0.235844
+-0.235844, -0.235844, -0.235844, -0.235844, -0.235844, -0.235844
htzero1v2=
--34.671750,-34.671750,-34.671750,-34.671750,-34.671750,-34.671750,-34.671750,-34.671750,-34.671750,-34.671750,-34.671750,-34.671750, -34.671750, -34.671750, -34.671750, -34.671750
--33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728, -33.978728
--32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534, -32.169534
-89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186, 89.654186
--23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829, -23.351829
--19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000
+-0.360782,-0.360782,-0.360782,-0.360782,-0.360782,-0.360782,-0.360782,-0.360782,-0.360782,-0.360782,-0.360782,-0.360782, -0.360782, -0.360782, -0.360782, -0.360782
+-0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -2.319835, 0.591877, 0.444657, -2.247234, 0.657201, 0.961243
+2.378383, 0.702983, 1.542095, 1.018483, -2.623737, 1.924444, -0.439586, 1.476934, 0.159346, -2.786115, -2.004209, -1.777835, -0.348217, -1.973355, 1.239530, 1.195694
+-12.038687, -12.672762, -12.168589, -9.587674, -10.791626, -12.104738, -12.105410, -10.879241, -10.965521, -10.986241, -9.156899, -10.913252, -10.306322, -11.696836, -10.150076, -9.832845
+-0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782
+-0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782, -0.360782
htzero1v1=
--36.141474,-36.141474,-36.141474,-36.141474,-36.141474,-36.141474,-36.141474,-36.141474,-36.141474,-36.141474,-36.141474,-36.141474, -36.141474, -36.141474, -36.141474, -36.141474
--33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418, -33.419418
--24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045, -24.050045
--30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149, -30.088149
--31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242, -31.266242
--29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000, -29.500000
+0.056777,0.056777,0.056777,0.056777,0.056777,0.056777,0.056777,0.056777,0.056777,0.056777,0.056777,0.056777, 0.056777, 0.056777, 0.056777, 0.056777
+0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 4.547534, 2.235373, 1.974181, 3.460725, 1.751240
+10.840962, 10.700579, 8.895142, 9.353270, 9.823554, 7.512771, 8.958583, 8.238757, 9.197163, 9.524870, 6.904495, 7.359968, 7.466835, 7.230424, 9.142605, 9.054584
+1.394358, 2.341733, 2.148144, 1.861803, 2.994325, 1.355178, 2.755621, -0.386349, 2.773778, 2.780067, 2.528076, -3.202286, 1.516145, 0.137389, 0.541036, 2.076961
+4.268745, 0.996205, -1.184394, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777
+0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777, 0.056777
htzero2v1=
--21.978700,-21.978700,-21.978700,-21.978700,-21.978700,-21.978700,-21.978700,-21.978700,-21.978700,-21.978700,-21.978700,-21.978700, -21.978700, -21.978700, -21.978700, -21.978700
--20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007, -20.377007
--30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968, -30.778968
--30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437, -30.503437
--31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809, -31.740809
-90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000, 90.500000
+0.299656,0.299656,0.299656,0.299656,0.299656,0.299656,0.299656,0.299656,0.299656,0.299656,0.299656,0.299656, 0.299656, 0.299656, 0.299656, 0.299656
+0.299656, 0.299656, 0.299656, 17.615062, 16.266423, 15.222659, 14.991135, 16.589486, 16.630645, 14.850435, 15.182261, 14.186189, 15.824898, 15.537950, 11.483851, 14.726779
+1.291619, 4.420768, 4.467209, 3.448156, 5.010954, 1.694498, 2.356976, 3.623449, 1.344684, 1.525875, 1.060199, 2.430454, 1.376539, 2.827684, 2.566937, 3.327397
+2.423852, 6.228236, 2.966292, 1.859325, 3.338334, 2.985167, 2.574601, 2.970279, 3.243175, 3.358809, 2.344155, 4.007402, 1.783628, 2.935726, 4.610063, 3.186960
+2.409325, 3.139373, 2.470385, 4.077475, 2.703090, 2.542883, 2.354454, 0.630552, 1.437273, 2.353783, 3.741433, 5.949991, 2.903032, 0.299656, 0.299656, 0.299656
+0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656, 0.299656
htzero2v2=
--22.598973,-22.598973,-22.598973,-22.598973,-22.598973,-22.598973,-22.598973,-22.598973,-22.598973,-22.598973,-22.598973,-22.598973, -22.598973, -22.598973, -22.598973, -22.598973
--22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251, -22.303251
--21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235, -21.367235
--20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283, -20.548283
--28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055, -28.794055
--32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534, -32.973534
+0.448584,0.448584,0.448584,0.448584,0.448584,0.448584,0.448584,0.448584,0.448584,0.448584,0.448584,0.448584, 0.448584, 0.448584, 0.448584, 0.448584
+0.448584, 0.448584, 13.470626, 11.462295, 12.761187, 11.003779, 10.838023, 12.541711, 14.329316, 12.583948, 12.640804, 11.655172, 11.451404, 12.228351, 10.361279, 11.372503
+12.028368, 13.079969, 13.699613, 13.037006, 11.603184, 11.072980, 13.039255, 9.118913, 10.856953, 11.463911, 10.217146, 12.856265, 12.913209, 13.021339, 13.116918, 11.982594
+11.939152, 13.209146, 11.272632, 12.104794, 12.093455, 12.951738, 12.877152, 11.645539, 12.795627, 11.651128, 10.839254, 12.813041, 11.461426, 13.556875, 12.621861, 14.261961
+4.259383, 6.708841, 7.271381, 8.357777, 7.405683, 6.314754, 7.009311, 7.244615, 7.117724, 7.586139, 8.287895, 7.579187, 0.448584, 0.448584, 0.448584, 0.448584
+0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584, 0.448584
htzero2x2=
--23.504916,-23.504916,-23.504916,-23.504916,-23.504916,-23.504916,-23.504916,-23.504916,-23.504916,-23.504916,-23.504916,-22.726771, -22.726771, -22.726771, -22.726771, -22.726771
--22.726771, -22.726771, -22.726771, -22.726771, -22.726771, -22.726771, -22.726771, -22.726771, -22.726771, -22.726771, -22.726771, -23.150885, -23.150885, -23.150885, -23.150885, -23.150885
--23.150885, -23.150885, -23.150885, -23.150885, -23.150885, -23.150885, -23.150885, -23.150885, -23.150885, -23.150885, -23.150885, -21.811901, -21.811901, -21.811901, -21.811901, -21.811901
--21.811901, -21.811901, -21.811901, -21.811901, -21.811901, -21.811901, -21.811901, -21.811901, -21.811901, -21.811901, -21.811901, -31.794114, -31.794114, -31.794114, -31.794114, -31.794114
--31.794114, -31.794114, -31.794114, -31.794114, -31.794114, -31.794114, -31.794114, -31.794114, -31.794114, -31.794114, -31.794114, -32.435210, -32.435210, -32.435210, -32.435210, -32.435210
--32.435210, -32.435210, -32.435210, -32.435210, -32.435210, -32.435210, -32.435210, -32.435210, -32.435210, -32.435210, -32.435210, -31.970443, -31.970443, -31.970443, -31.970443, -31.970443
--31.970443, -31.970443, -31.970443, -31.970443, -31.970443, -31.970443
+0.569562,0.569562,0.569562,0.569562,0.569562,0.569562,0.569562,10.404776,11.780109,8.193035,10.209611,10.903120, 12.511954, 10.279236, 12.785944, 8.365718
+12.052531, 11.699112, 12.457822, 10.185126, 10.900987, 7.177271, 11.297888, 10.983969, 7.199682, 8.905160, 10.531838, 11.028660, 12.035721, 12.541247, 8.363851, 10.685992
+7.627011, 10.629357, 10.846796, 11.173747, 12.280845, 10.552766, 12.399045, 10.645917, 7.864579, 10.649480, 8.954613, 11.744633, 12.411083, 12.439303, 13.591708, 13.439628
+12.543921, 10.336689, 12.379954, 12.617369, 14.175194, 12.919046, 12.838428, 12.225072, 9.890925, 12.584072, 12.234283, 0.868956, 4.168237, 2.731485, -0.128286, 1.068468
+1.418291, 3.860443, 2.628738, 0.538911, 3.265782, 4.361283, 1.262435, 3.519726, 1.351752, 4.666350, 4.397085, 2.162306, 3.119561, 1.009323, 2.397034, 1.886510
+-0.674556, 0.643735, 2.721305, 1.074937, 2.438097, 3.123086, 4.148721, 4.010740, 2.887575, 2.678346, 3.637021, 2.930104, 2.014060, 2.989102, 4.449020, 2.973261
+0.569562, 0.569562, 0.569562, 0.569562, 0.569562, 0.569562
htzero2x1=
--31.855110,-31.855110,-31.855110,-31.855110,-31.855110,-31.855110,-31.855110,-31.855110,-31.855110,-31.855110,-31.855110,-29.945373, -29.945373, -29.945373, -29.945373, -29.945373
--29.945373, -29.945373, -29.945373, -29.945373, -29.945373, -29.945373, -29.945373, -29.945373, -29.945373, -29.945373, -29.945373, -31.333331, -31.333331, -31.333331, -31.333331, -31.333331
--31.333331, -31.333331, -31.333331, -31.333331, -31.333331, -31.333331, -31.333331, -31.333331, -31.333331, -31.333331, -31.333331, -22.237923, -22.237923, -22.237923, -22.237923, -22.237923
--22.237923, -22.237923, -22.237923, -22.237923, -22.237923, -22.237923, -22.237923, -22.237923, -22.237923, -22.237923, -22.237923, -23.439578, -23.439578, -23.439578, -23.439578, -23.439578
--23.439578, -23.439578, -23.439578, -23.439578, -23.439578, -23.439578, -23.439578, -23.439578, -23.439578, -23.439578, -23.439578, -23.015798, -23.015798, -23.015798, -23.015798, -23.015798
--23.015798, -23.015798, -23.015798, -23.015798, -23.015798, -23.015798, -23.015798, -23.015798, -23.015798, -23.015798, -23.015798, -20.520639, -20.520639, -20.520639, -20.520639, -20.520639
--20.520639, -20.520639, -20.520639, -20.520639, -20.520639, -20.520639
+0.690418,0.690418,0.690418,0.690418,0.690418,0.690418,0.690418,2.138639,3.474606,3.411287,0.856683,3.449601, 1.097621, 6.101669, 5.310499, 3.766601
+3.403759, 1.549514, 3.995556, 2.442767, 2.086376, 0.614957, 4.471278, 2.842020, 3.898069, 5.001901, 4.350275, 1.493368, 2.733296, 2.983749, 4.514780, 3.748456
+2.951389, 2.375594, 0.873097, 0.897957, 1.880766, 2.376731, 1.761207, 1.112792, 1.589636, 2.780106, 2.152011, 11.030750, 11.691050, 11.146253, 12.541402, 11.160811
+11.330154, 12.504118, 11.476709, 12.194296, 12.213496, 13.841532, 12.444269, 12.654715, 10.656134, 12.593693, 10.771141, 9.908371, 9.274898, 11.497406, 10.431471, 10.999468
+11.675564, 11.019768, 10.394450, 11.599143, 11.363862, 12.080189, 11.926548, 13.133571, 13.815902, 12.915014, 12.812057, 8.550189, 10.436016, 10.897144, 11.162117, 9.810874
+10.522350, 12.232713, 12.256187, 12.730156, 12.449467, 7.586767, 11.808452, 11.646506, 10.911856, 12.904593, 13.677107, 10.777655, 13.082179, 11.344131, 12.336534, 13.229167
+12.733059, 0.690418, 0.690418, 0.690418, 0.690418, 0.690418
htzero2u2=
--32.163235,-32.163235,-32.163235,-32.163235,-32.163235,-32.163235,-32.163235,-32.163235,-32.163235,-32.163235,-32.163235,-32.163235, -32.163235, -32.163235, -32.163235, -32.163235
--31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360, -31.508360
--29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649, -29.491649
-85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746, 85.262746
--19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618, -19.934618
--19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000
+0.729067,0.729067,0.729067,0.729067,0.729067,0.729067,0.729067,0.729067,0.729067,0.729067,0.729067,0.729067, 0.729067, 0.729067, 0.729067, 0.729067
+0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 3.077855, 3.750984, 3.756745, 1.204100, 4.559813, 2.195167, 5.687001, 1.406401
+3.221642, 4.769301, 4.689992, 0.954977, 3.168591, 0.719712, 1.912802, 3.218336, 3.038141, 2.252877, 3.120116, 3.690723, 4.738204, 1.871927, 3.133931, 3.618991
+-17.156001, -17.498343, -17.485326, -17.457164, -18.599430, -17.376092, -18.075124, -14.810809, -16.500437, -14.791328, -13.914599, -14.409786, -13.591253, -12.985937, -17.749782, -13.874168
+14.883889, 16.196995, 16.040501, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067
+0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067, 0.729067
htzero2u1=
--33.037095,-33.037095,-33.037095,-33.037095,-33.037095,-33.037095,-33.037095,-33.037095,-33.037095,-33.037095,-33.037095,-33.037095, -33.037095, -33.037095, -33.037095, -33.037095
--29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282, -29.924282
--21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217, -21.589217
--21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159, -21.316159
--22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970, -22.865970
--19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000, -19.500000
+0.856743,0.856743,0.856743,0.856743,0.856743,0.856743,0.856743,0.856743,0.856743,0.856743,0.856743,0.856743, 0.856743, 0.856743, 0.856743, 0.856743
+0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 8.045445, 5.815786, 6.494154, 6.879835, 5.189732
+12.614535, 13.922486, 13.798620, 11.778825, 11.105892, 11.486146, 11.668556, 12.959139, 13.289587, 10.680429, 12.734136, 12.173242, 11.334047, 11.326106, 12.763017, 12.928244
+13.648832, 13.326355, 11.265252, 11.789567, 12.857294, 12.287875, 11.495660, 12.852904, 11.758290, 11.672504, 11.644293, 12.615187, 10.989521, 11.803614, 8.749699, 12.887698
+12.459108, 12.797983, 11.864095, 11.216203, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743
+0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743, 0.856743
diff --git a/PARAM/HMS/GEN/h_fadc_debug.param b/PARAM/HMS/GEN/h_fadc_debug.param
index 2ba61ce31f28f8e448465aa5502db2b5f160b80f..abc32c4cd07f656bc38e254abe00b1d132f166f2 100644
--- a/PARAM/HMS/GEN/h_fadc_debug.param
+++ b/PARAM/HMS/GEN/h_fadc_debug.param
@@ -1,5 +1,5 @@
-hcer_debug_adc = 0
-hcal_debug_adc = 0
-hhodo_debug_adc = 0
-hdc_debug_adc = 0
+hcer_debug_adc = 1
+hcal_debug_adc = 1
+hhodo_debug_adc = 1
+hdc_debug_adc = 1
haero_debug_adc = 0
\ No newline at end of file
diff --git a/PARAM/HMS/GEN/h_reftime_cut.param b/PARAM/HMS/GEN/h_reftime_cut.param
index 19956c61bc8eb6aaca2c0e6ce1928fcb9a40d9cc..b6bc6d4286cd365cdeed2790d837086a6102279e 100644
--- a/PARAM/HMS/GEN/h_reftime_cut.param
+++ b/PARAM/HMS/GEN/h_reftime_cut.param
@@ -7,10 +7,10 @@
; is used as reftime. If no ref time is found greater than the abs(refcut) then no
; reference time is used and warning message is produced.
; Cut is on reference time per detector.
-hdc_tdcrefcut=-14000.
-hhodo_tdcrefcut=-1000.
-hhodo_adcrefcut=-150./.0625
-hcer_adcrefcut=-150./.0625
-hcal_adcrefcut=-150./.0625
+hdc_tdcrefcut=-16500.
+hhodo_tdcrefcut=-3000.
+hhodo_adcrefcut=-3500.
+hcer_adcrefcut=-3500.
+hcal_adcrefcut=-3500.
diff --git a/PARAM/HMS/HODO/hhodo_cuts.param b/PARAM/HMS/HODO/hhodo_cuts.param
index 3c68d6eb2301133c5c23dcd2859ecb7cd1f71246..ac4cacbff1357b5ec3ab26cb9877b6f949d16beb 100644
--- a/PARAM/HMS/HODO/hhodo_cuts.param
+++ b/PARAM/HMS/HODO/hhodo_cuts.param
@@ -16,10 +16,19 @@ htofusinginvadc=0
hstart_time_center = 32.
; hstart_time_slop 1/2 width of time window
hstart_time_slop = 100.
+
; hscin_tdc_min minimum tdc value in hms scin
- hscin_tdc_min = -500
+; hscin_tdc_min = -500
+
+; with 4698
+ hscin_tdc_min = -50
+
; hscin_tdc_max maximum allowed tdc value
- hscin_tdc_max = 4000
+; hscin_tdc_max = 4000
+
+; with 4698
+ hscin_tdc_max = 800
+
; hscin_tdc_to_time scin tdc time per channel
hscin_tdc_to_time = 0.09766 ;0.1 was before Dave Mack found the correct conversion in C1190 Manual (May 14, 2018); (See HC Log Entry 3574348)
@@ -39,73 +48,73 @@ hhodo_tdc_offset = 1580, 1580, 1580, 1580
hhodo_adc_tdc_offset = 200., 200., 200., 200.
-hhodo_PosAdcTimeWindowMin = -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.
+hhodo_PosAdcTimeWindowMin = -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.
-hhodo_PosAdcTimeWindowMax = 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.
+hhodo_PosAdcTimeWindowMax = -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.
-hhodo_NegAdcTimeWindowMin = -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.
+hhodo_NegAdcTimeWindowMin = -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.,
+ -70., -75., -70., -80.
-hhodo_NegAdcTimeWindowMax = 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.
+hhodo_NegAdcTimeWindowMax = -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.,
+ -20., -20., -20., -20.
;
hhodo_pos_ped_limit = 1000,1000,1000,1000,1000,1000,1000,1000
diff --git a/PARAM/SHMS/AERO/paero_calib.param b/PARAM/SHMS/AERO/paero_calib.param
index f868fea963fc4b7a4a2c9708dbafd69a263f5077..ff1ecb977b40e3ff163fa25f6b78c340feb9657a 100644
--- a/PARAM/SHMS/AERO/paero_calib.param
+++ b/PARAM/SHMS/AERO/paero_calib.param
@@ -1,3 +1,5 @@
-; SHMS aerogel gain factors from 0.5% C production run 1585
-paero_pos_gain = 1./7.56425, 1./10.3021, 1./11.0215, 1./13.746, 1./10.4022, 1./11.2585, 1./11.7267
-paero_neg_gain = 1./12.1112, 1./11.9825, 1./12.3054, 1./12.5971, 1./11.6322, 1./8.2361, 1./12.8493
\ No newline at end of file
+
+; SHMS aerogel gain factors from 0.5% C production run 4698
+: SHMS aerogel gain fators from LH2 production 4965
+paero_neg_gain = 1./13.0561, 1./10.9350, 1./12.7182, 1./11.8223, 1./10.5835, 1./8.43767, 1./12.9098,
+paero_pos_gain = 1./7.32454, 1./9.78246, 1./10.4120, 1./12.7322, 1./10.4748, 1./10.6406, 1./10.6904,
diff --git a/PARAM/SHMS/AERO/paero_calib_after_aerogel_change_011.param b/PARAM/SHMS/AERO/paero_calib_after_aerogel_change_011.param
new file mode 100644
index 0000000000000000000000000000000000000000..a7d5c15dc2eea860e409f2cf3946946ce095bdad
--- /dev/null
+++ b/PARAM/SHMS/AERO/paero_calib_after_aerogel_change_011.param
@@ -0,0 +1,4 @@
+
+; SHMS aerogel gain factors from 0.5% C production run 4698
+paero_neg_gain = 1./13.0028, 1./10.9573, 1./12.5605, 1./11.7673, 1./10.4386, 1./8.43599, 1./12.7153,
+paero_pos_gain = 1./7.3107, 1./9.89528, 1./10.4261, 1./12.6266, 1./10.4952, 1./10.6188, 1./10.7433,
diff --git a/PARAM/SHMS/AERO/paero_cuts.param b/PARAM/SHMS/AERO/paero_cuts.param
index 60d51b86c007dd584bbaf868fb42e55e8258030d..0de7362f841a36643f5d046fbfc273d9ae044fe3 100644
--- a/PARAM/SHMS/AERO/paero_cuts.param
+++ b/PARAM/SHMS/AERO/paero_cuts.param
@@ -20,8 +20,8 @@ paero_npe_thresh = 0.5
; ADC time window cut values used to select "good" ADC events
paero_adc_tdc_offset = 200.
-paero_adcPosTimeWindowMin = -1000., -1000., -1000., -1000., -1000., -1000., -1000.
-paero_adcNegTimeWindowMin = -1000., -1000., -1000., -1000., -1000., -1000., -1000.
+paero_adcPosTimeWindowMin = -40., -40., -40., -40., -40., -40., -40.
+paero_adcNegTimeWindowMin = 160., 160., 160., 160., 160., 160., 160.
-paero_adcPosTimeWindowMax = 1000., 1000., 1000., 1000., 1000., 1000., 1000.
-paero_adcNegTimeWindowMax = 1000., 1000., 1000., 1000., 1000., 1000., 1000.
+paero_adcPosTimeWindowMax = 40., 40., 40., 40., 40., 40., 40.
+paero_adcNegTimeWindowMax = 235., 235., 235., 235., 235., 235., 235.
diff --git a/PARAM/SHMS/CAL/pcal_calib.param b/PARAM/SHMS/CAL/pcal_calib.param
index 04064627b9899eac45d164e028d8c9bbbc8e9a0a..feb6c15ec2e98b9616f5332c32478143611ad9ef 100644
--- a/PARAM/SHMS/CAL/pcal_calib.param
+++ b/PARAM/SHMS/CAL/pcal_calib.param
@@ -1,7 +1,8 @@
; Calibration constants for run 1791_300000, 38067 events processed
-pcal_neg_gain_cor = 31.20, 28.28, 28.19, 29.18, 31.57, 27.67, 30.21, 32.54, 31.59, 28.61, 30.12, 28.67, 35.35, 0.00,
-pcal_pos_gain_cor = 29.91, 27.86, 27.42, 28.18, 31.90, 34.08, 29.00, 24.00, 27.65, 27.75, 31.99, 26.58, 23.02, 0.00,
+; this is the one to use
+pcal_neg_gain_cor = 31.20, 28.28, 28.19, 29.18, 31.57, 27.67, 30.21, 32.54, 31.59, 28.61, 30.12, 28.67, 35.35, 30.00,
+pcal_pos_gain_cor = 29.91, 27.86, 27.42, 28.18, 31.90, 34.08, 29.00, 24.00, 27.65, 27.75, 31.99, 26.58, 23.02, 30.00,
pcal_arr_gain_cor = 0.00, 0.00, 0.00, 37.46, 24.21, 25.41, 14.60, 32.73, 40.66, 9.56, 19.92, 0.00, 0.00, 0.00, 0.00, 0.00,
49.52, 28.39, 57.17, 43.51, 44.38, 36.14, 42.24, 25.59, 22.50, 37.73, 72.10, 45.51, 0.00, 0.00, 0.00, 0.00,
54.73, 39.81, 37.85, 33.96, 58.96, 62.49, 41.46, 60.29, 32.42, 50.27, 39.06, 73.12, 27.12, 0.00, 0.00, 0.00,
@@ -16,3 +17,43 @@ pcal_arr_gain_cor = 0.00, 0.00, 0.00, 37.46, 24.21, 25.41, 14.60, 32.73, 40.6
39.82, 56.21, 39.53, 37.01, 42.92, 41.25, 22.11, 27.69, 45.91, 32.81, 28.12, 45.18, 59.98, 0.00, 0.00, 0.00,
0.00, 42.99, 25.68, 60.17, 67.59, 52.29, 28.33, 42.01, 68.30, 42.20, 39.85, 0.00, 0.00, 0.00, 0.00, 0.00,
0.00, 0.00, 0.00, 15.01, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+
+
+
+; for PID leg study
+;pcal_neg_gain_cor = 0.00, 28.00, 27.45, 22.27, 28.86, 26.57, 31.51, 30.43, 22.22, 27.01, 26.13, 25.66, 26.05, 0.00,
+;pcal_pos_gain_cor = 0.00, 33.58, 28.61, 23.96, 29.48, 30.52, 25.73, 18.54, 24.20, 23.62, 28.89, 28.11, 0.00, 0.00,
+;pcal_arr_gain_cor = 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 0.00, 27.87, 44.05, 34.54, 29.36, 77.76, 59.23, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 0.00, 21.93, 24.92, 55.77, 51.61, 41.99, 30.10, 34.93, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 0.00, 0.00, 60.61, 17.23, 40.44, 40.15, 52.00, 71.58, 36.17, 61.62, 49.57, 73.52, 16.32, 0.00, 0.00,
+; 0.00, 0.00, 44.65, 39.30, 23.70, 44.51, 54.03, 41.67, 36.05, 36.45, 30.67, 22.06, 36.63, 34.46, 0.00, 0.00,
+; 0.00, 9.96, 15.70, 13.08, 17.37, 11.50, 17.79, 20.53, 12.55, 17.62, 24.93, 20.60, 28.09, 16.62, 13.28, 0.00,
+; 0.00, 35.07, 31.51, 31.24, 52.22, 42.52, 24.13, 43.97, 60.84, 75.20, 27.95, 63.58, 27.60, 24.22, 0.00, 0.00,
+; 0.00, 51.90, 19.10, 42.55, 24.31, 59.20, 46.71, 60.17, 36.27, 0.00, 0.00, 37.62, 55.44, 33.35, 0.00, 0.00,
+; 0.00, 38.44, 68.03, 40.54, 30.05, 40.99, 19.13, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 39.54, 32.12, 35.51, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+
+
+; for debugging
+;pcal_neg_gain_cor = 32.84, 25.57, 26.37, 20.68, 26.81, 25.34, 29.76, 29.71, 19.14, 26.73, 0.00, 0.00, 0.00, 0.00,
+;pcal_pos_gain_cor = 30.93, 19.91, 22.61, 21.74, 28.08, 28.83, 24.54, 17.47, 24.75, 21.46, 0.00, 0.00, 0.00, 0.00,
+;pcal_arr_gain_cor = 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 27.25, 54.67, 35.28, 46.33, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 54.94, 32.94, 33.12, 30.12, 52.22, 59.13, 34.21, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 20.36, 40.48, 33.39, 44.18, 33.24, 26.62, 75.22, 54.20, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 45.00, 28.46, 27.81, 24.76, 55.74, 48.75, 40.22, 29.25, 30.53, 22.88, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 30.88, 27.84, 63.26, 16.55, 36.99, 37.53, 48.49, 65.68, 31.31, 10.63, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 31.92, 47.85, 39.70, 22.37, 42.08, 50.86, 39.04, 33.34, 34.05, 28.84, 26.98, 0.00, 0.00, 0.00, 0.00,
+; 31.85, 10.50, 15.41, 13.34, 16.07, 12.45, 17.06, 19.69, 12.22, 17.70, 24.32, 14.24, 0.00, 0.00, 0.00, 0.00,
+; 40.20, 35.72, 29.06, 29.65, 48.63, 40.57, 23.28, 42.88, 57.72, 66.21, 27.23, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 49.37, 51.75, 19.31, 40.11, 23.48, 55.42, 43.26, 54.04, 34.34, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 22.25, 37.91, 64.42, 39.99, 32.71, 40.73, 20.82, 33.05, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 18.45, 41.59, 30.46, 33.68, 42.83, 41.06, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 46.19, 25.62, 52.46, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+; 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00,
+
diff --git a/PARAM/SHMS/CAL/pcal_cuts.param b/PARAM/SHMS/CAL/pcal_cuts.param
index d958558103f8e372b33f59596df65898dc178a7a..88f868cf793d5012c53d77708c82b02da35416dc 100644
--- a/PARAM/SHMS/CAL/pcal_cuts.param
+++ b/PARAM/SHMS/CAL/pcal_cuts.param
@@ -10,11 +10,11 @@ pcal_ADCmode = 1
; FADC pulse time window cuts
pcal_adc_tdc_offset=200.
-pcal_pos_AdcTimeWindowMin = -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.
-pcal_neg_AdcTimeWindowMin = -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.
+pcal_pos_AdcTimeWindowMin = -40., -40., -40., -40., -40., -40., -40., -40., -40., -40., -40., -40., -40., -40.
+pcal_neg_AdcTimeWindowMin = -40., -40., -40., -40., -40., -40., -40., -40., -40., -40., -40., -40., -40., -40.
-pcal_pos_AdcTimeWindowMax = 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.
-pcal_neg_AdcTimeWindowMax = 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.
+pcal_pos_AdcTimeWindowMax = 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10.
+pcal_neg_AdcTimeWindowMax = 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10., 10.
; Threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
pcal_AdcNegThreshold = 0.
@@ -26,39 +26,39 @@ pcal_arr_ADCmode = 1
pcal_arr_adc_tdc_offset = 200.0
; FADC pulse time window cuts
; Shower time window cuts from runs 2484, 2788, 3072
-pcal_arr_AdcTimeWindowMin = -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.,
- -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000., -1000.
+pcal_arr_AdcTimeWindowMin = -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.,
+ -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35., -35.
-pcal_arr_AdcTimeWindowMax = 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.,
- 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000., 1000.
+pcal_arr_AdcTimeWindowMax = 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.,
+ 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.
; Threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
pcal_arr_AdcThreshold = 0.
diff --git a/PARAM/SHMS/DC/pdc_calib.param b/PARAM/SHMS/DC/pdc_calib.param
index 3594efbeba0e5862c1d0f1cc21c8eb3b6fe6bb57..175242d63c4e1076bed1a62aececbf393854c78a 100644
--- a/PARAM/SHMS/DC/pdc_calib.param
+++ b/PARAM/SHMS/DC/pdc_calib.param
@@ -1,127 +1,127 @@
-; Lookup Table: RUN 1791
+; Lookup Table: RUN 4698
; number of bins in time to distance lookup table
pdriftbins = 190
; number of 1st bin in table in ns
pdrift1stbin=1.000000
; bin size in ns
pdriftbinsz=1
-pwc1u1fract=0.00066,0.00201,0.00434,0.00770,0.01217,0.01732,0.02352,0.03050,0.03819,0.04654,0.05549,0.06479,0.07437,0.08436,0.09492,0.10530,0.11615,0.12759,0.13901
-0.15082,0.16243,0.17421,0.18618,0.19826,0.21015,0.22200,0.23412,0.24621,0.25825,0.27035,0.28232,0.29447,0.30639,0.31805,0.32947,0.34098,0.35234,0.36361,0.37498
-0.38606,0.39715,0.40850,0.41998,0.43143,0.44297,0.45424,0.46538,0.47663,0.48766,0.49870,0.51017,0.52126,0.53229,0.54311,0.55385,0.56436,0.57496,0.58576,0.59622
-0.60711,0.61803,0.62842,0.63909,0.64944,0.65985,0.67019,0.68037,0.69054,0.70091,0.71092,0.72101,0.73096,0.74123,0.75122,0.76093,0.77070,0.78081,0.79013,0.79963
-0.80903,0.81875,0.82821,0.83739,0.84685,0.85583,0.86462,0.87343,0.88224,0.89065,0.89907,0.90718,0.91503,0.92266,0.92974,0.93663,0.94314,0.94893,0.95449,0.95959
-0.96425,0.96827,0.97208,0.97542,0.97863,0.98105,0.98335,0.98524,0.98712,0.98874,0.99015,0.99145,0.99259,0.99361,0.99437,0.99514,0.99581,0.99647,0.99692,0.99727
-0.99765,0.99790,0.99819,0.99850,0.99875,0.99892,0.99906,0.99919,0.99930,0.99939,0.99945,0.99956,0.99961,0.99967,0.99973,0.99975,0.99978,0.99981,0.99984,0.99984
-0.99986,0.99988,0.99988,0.99991,0.99991,0.99992,0.99992,0.99992,0.99994,0.99995,0.99995,0.99995,0.99995,0.99995,0.99996,0.99996,0.99997,0.99997,0.99998,0.99998
-0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999
+pwc1u1fract=0.00021,0.00066,0.00157,0.00299,0.00519,0.00831,0.01249,0.01761,0.02368,0.03077,0.03844,0.04698,0.05563,0.06496,0.07481,0.08513,0.09568,0.10664,0.11775
+0.12930,0.14084,0.15259,0.16452,0.17660,0.18874,0.20116,0.21343,0.22567,0.23796,0.25021,0.26244,0.27458,0.28668,0.29852,0.31029,0.32243,0.33439,0.34626,0.35788
+0.36944,0.38129,0.39290,0.40439,0.41601,0.42740,0.43878,0.45028,0.46167,0.47326,0.48454,0.49585,0.50687,0.51793,0.52884,0.53958,0.55050,0.56137,0.57219,0.58294
+0.59380,0.60464,0.61542,0.62609,0.63658,0.64700,0.65744,0.66770,0.67801,0.68840,0.69861,0.70862,0.71848,0.72864,0.73850,0.74833,0.75795,0.76764,0.77731,0.78696
+0.79647,0.80575,0.81520,0.82435,0.83356,0.84264,0.85160,0.86037,0.86915,0.87773,0.88607,0.89425,0.90201,0.90979,0.91722,0.92422,0.93089,0.93723,0.94312,0.94864
+0.95362,0.95814,0.96225,0.96597,0.96934,0.97229,0.97496,0.97742,0.97951,0.98148,0.98313,0.98476,0.98616,0.98753,0.98868,0.98970,0.99065,0.99160,0.99245,0.99314
+0.99380,0.99441,0.99501,0.99554,0.99602,0.99643,0.99683,0.99718,0.99745,0.99770,0.99796,0.99819,0.99837,0.99854,0.99870,0.99883,0.99895,0.99905,0.99915,0.99925
+0.99934,0.99941,0.99946,0.99952,0.99958,0.99963,0.99967,0.99970,0.99972,0.99974,0.99976,0.99978,0.99982,0.99984,0.99986,0.99986,0.99988,0.99988,0.99989,0.99990
+0.99991,0.99992,0.99993,0.99994,0.99994,0.99995,0.99995,0.99995,0.99996,0.99996,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999
+0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000
+pwc1u2fract=0.00024,0.00073,0.00167,0.00331,0.00576,0.00921,0.01379,0.01948,0.02618,0.03383,0.04239,0.05160,0.06140,0.07176,0.08255,0.09380,0.10525,0.11710,0.12896
+0.14083,0.15298,0.16523,0.17779,0.19038,0.20292,0.21551,0.22768,0.23988,0.25201,0.26404,0.27619,0.28824,0.30015,0.31197,0.32387,0.33558,0.34728,0.35915,0.37061
+0.38204,0.39332,0.40479,0.41615,0.42745,0.43872,0.45000,0.46120,0.47258,0.48351,0.49453,0.50554,0.51655,0.52720,0.53805,0.54880,0.55956,0.57033,0.58094,0.59131
+0.60210,0.61269,0.62307,0.63346,0.64371,0.65398,0.66418,0.67437,0.68448,0.69443,0.70442,0.71448,0.72418,0.73383,0.74354,0.75316,0.76264,0.77228,0.78178,0.79117
+0.80061,0.80989,0.81892,0.82800,0.83691,0.84562,0.85436,0.86294,0.87134,0.87954,0.88746,0.89548,0.90343,0.91082,0.91811,0.92475,0.93135,0.93732,0.94284,0.94800
+0.95281,0.95730,0.96126,0.96498,0.96817,0.97106,0.97363,0.97596,0.97800,0.97999,0.98178,0.98340,0.98491,0.98623,0.98747,0.98855,0.98958,0.99048,0.99142,0.99220
+0.99293,0.99362,0.99422,0.99481,0.99534,0.99578,0.99617,0.99652,0.99685,0.99716,0.99742,0.99771,0.99795,0.99818,0.99835,0.99852,0.99866,0.99878,0.99890,0.99902
+0.99912,0.99920,0.99927,0.99934,0.99941,0.99947,0.99953,0.99958,0.99962,0.99966,0.99969,0.99973,0.99976,0.99980,0.99983,0.99984,0.99986,0.99987,0.99989,0.99990
+0.99991,0.99992,0.99993,0.99993,0.99994,0.99995,0.99996,0.99996,0.99997,0.99997,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000
1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
-pwc1u2fract=0.00067,0.00199,0.00431,0.00773,0.01203,0.01757,0.02393,0.03122,0.03914,0.04767,0.05693,0.06616,0.07625,0.08622,0.09669,0.10781,0.11876,0.13022,0.14201
-0.15333,0.16524,0.17673,0.18860,0.20064,0.21247,0.22402,0.23583,0.24800,0.25985,0.27179,0.28361,0.29530,0.30721,0.31854,0.33027,0.34191,0.35331,0.36449,0.37574
-0.38703,0.39847,0.40979,0.42120,0.43250,0.44319,0.45414,0.46562,0.47692,0.48817,0.49912,0.51017,0.52126,0.53219,0.54279,0.55339,0.56415,0.57451,0.58512,0.59564
-0.60634,0.61673,0.62706,0.63753,0.64786,0.65828,0.66841,0.67880,0.68905,0.69894,0.70878,0.71863,0.72855,0.73850,0.74805,0.75855,0.76835,0.77796,0.78762,0.79746
-0.80688,0.81663,0.82613,0.83533,0.84442,0.85349,0.86277,0.87169,0.88049,0.88920,0.89762,0.90600,0.91375,0.92136,0.92876,0.93569,0.94222,0.94842,0.95407,0.95928
-0.96389,0.96823,0.97171,0.97510,0.97841,0.98103,0.98334,0.98531,0.98734,0.98895,0.99035,0.99157,0.99264,0.99364,0.99450,0.99528,0.99596,0.99654,0.99700,0.99737
-0.99775,0.99806,0.99828,0.99854,0.99871,0.99890,0.99906,0.99918,0.99931,0.99943,0.99949,0.99957,0.99962,0.99971,0.99975,0.99980,0.99982,0.99984,0.99984,0.99985
-0.99988,0.99989,0.99990,0.99990,0.99991,0.99991,0.99993,0.99994,0.99994,0.99995,0.99995,0.99995,0.99995,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99997
-0.99997,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000
-1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
-pwc1x1fract=0.00091,0.00241,0.00474,0.00820,0.01301,0.01842,0.02518,0.03269,0.04077,0.04954,0.05852,0.06789,0.07804,0.08869,0.09936,0.10995,0.12101,0.13232,0.14412
-0.15574,0.16743,0.17927,0.19097,0.20256,0.21430,0.22594,0.23760,0.24936,0.26154,0.27348,0.28562,0.29701,0.30902,0.32035,0.33179,0.34345,0.35501,0.36658,0.37858
-0.38998,0.40137,0.41244,0.42399,0.43518,0.44653,0.45782,0.46892,0.47998,0.49026,0.50099,0.51225,0.52322,0.53383,0.54476,0.55591,0.56673,0.57730,0.58780,0.59873
-0.60911,0.61995,0.63057,0.64106,0.65141,0.66204,0.67224,0.68243,0.69244,0.70296,0.71289,0.72297,0.73283,0.74276,0.75287,0.76274,0.77245,0.78252,0.79195,0.80160
-0.81133,0.82089,0.83038,0.83970,0.84937,0.85824,0.86729,0.87587,0.88442,0.89310,0.90164,0.90970,0.91750,0.92515,0.93240,0.93914,0.94574,0.95152,0.95707,0.96209
-0.96658,0.97068,0.97456,0.97803,0.98093,0.98346,0.98573,0.98769,0.98930,0.99068,0.99194,0.99306,0.99404,0.99481,0.99544,0.99602,0.99658,0.99705,0.99744,0.99778
-0.99808,0.99832,0.99859,0.99876,0.99891,0.99903,0.99916,0.99926,0.99936,0.99946,0.99952,0.99955,0.99958,0.99963,0.99970,0.99973,0.99976,0.99978,0.99980,0.99981
-0.99984,0.99986,0.99987,0.99988,0.99989,0.99990,0.99991,0.99991,0.99993,0.99993,0.99993,0.99993,0.99994,0.99994,0.99994,0.99994,0.99994,0.99994,0.99994,0.99995
-0.99996,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000
-1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
-pwc1x2fract=0.00074,0.00228,0.00507,0.00888,0.01391,0.02017,0.02725,0.03555,0.04429,0.05401,0.06379,0.07404,0.08479,0.09605,0.10747,0.11865,0.13024,0.14201,0.15395
-0.16576,0.17743,0.18918,0.20108,0.21295,0.22480,0.23670,0.24828,0.26015,0.27145,0.28328,0.29472,0.30607,0.31773,0.32890,0.34015,0.35137,0.36272,0.37387,0.38485
-0.39586,0.40690,0.41792,0.42892,0.44011,0.45148,0.46261,0.47327,0.48404,0.49512,0.50596,0.51680,0.52757,0.53813,0.54881,0.55949,0.57011,0.58078,0.59141,0.60227
-0.61230,0.62287,0.63343,0.64384,0.65426,0.66455,0.67519,0.68577,0.69584,0.70567,0.71575,0.72577,0.73553,0.74548,0.75502,0.76475,0.77440,0.78420,0.79379,0.80343
-0.81330,0.82274,0.83195,0.84077,0.84983,0.85931,0.86787,0.87687,0.88551,0.89365,0.90202,0.90982,0.91748,0.92475,0.93206,0.93889,0.94538,0.95176,0.95743,0.96233
-0.96688,0.97110,0.97486,0.97822,0.98085,0.98348,0.98584,0.98775,0.98942,0.99096,0.99217,0.99326,0.99422,0.99503,0.99562,0.99617,0.99673,0.99725,0.99770,0.99798
-0.99828,0.99852,0.99872,0.99892,0.99908,0.99924,0.99932,0.99940,0.99949,0.99957,0.99961,0.99969,0.99973,0.99975,0.99977,0.99979,0.99984,0.99985,0.99986,0.99988
-0.99990,0.99991,0.99992,0.99992,0.99993,0.99993,0.99994,0.99994,0.99995,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997
-0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999
-0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
-pwc1v1fract=0.00067,0.00198,0.00418,0.00735,0.01154,0.01646,0.02246,0.02914,0.03653,0.04475,0.05332,0.06216,0.07179,0.08197,0.09236,0.10336,0.11423,0.12577,0.13718
-0.14889,0.16090,0.17291,0.18484,0.19688,0.20891,0.22112,0.23341,0.24532,0.25767,0.26958,0.28202,0.29379,0.30530,0.31718,0.32899,0.34091,0.35253,0.36427,0.37570
-0.38672,0.39836,0.40942,0.42139,0.43282,0.44424,0.45523,0.46612,0.47751,0.48838,0.49921,0.51045,0.52150,0.53243,0.54293,0.55355,0.56447,0.57525,0.58610,0.59663
-0.60703,0.61715,0.62741,0.63798,0.64841,0.65871,0.66907,0.67954,0.68942,0.69930,0.70918,0.71929,0.72903,0.73902,0.74865,0.75848,0.76821,0.77780,0.78709,0.79648
-0.80582,0.81510,0.82436,0.83365,0.84269,0.85211,0.86100,0.87005,0.87881,0.88713,0.89552,0.90344,0.91139,0.91907,0.92643,0.93370,0.93998,0.94564,0.95117,0.95640
-0.96139,0.96540,0.96927,0.97259,0.97565,0.97841,0.98091,0.98308,0.98497,0.98673,0.98832,0.98963,0.99077,0.99188,0.99274,0.99358,0.99436,0.99499,0.99557,0.99615
-0.99663,0.99710,0.99744,0.99778,0.99805,0.99832,0.99852,0.99871,0.99887,0.99903,0.99915,0.99922,0.99937,0.99944,0.99952,0.99957,0.99965,0.99970,0.99973,0.99975
-0.99979,0.99980,0.99982,0.99986,0.99987,0.99988,0.99988,0.99989,0.99991,0.99991,0.99992,0.99992,0.99994,0.99994,0.99994,0.99995,0.99995,0.99995,0.99996,0.99996
-0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999
+pwc1x1fract=0.00035,0.00098,0.00218,0.00414,0.00698,0.01093,0.01587,0.02183,0.02892,0.03695,0.04570,0.05528,0.06521,0.07583,0.08683,0.09821,0.10997,0.12193,0.13419
+0.14642,0.15894,0.17143,0.18403,0.19647,0.20906,0.22151,0.23385,0.24609,0.25832,0.27069,0.28300,0.29490,0.30680,0.31863,0.33046,0.34240,0.35403,0.36567,0.37719
+0.38871,0.40015,0.41164,0.42320,0.43457,0.44589,0.45703,0.46823,0.47927,0.49030,0.50130,0.51225,0.52331,0.53418,0.54527,0.55618,0.56691,0.57755,0.58817,0.59883
+0.60939,0.61989,0.63011,0.64046,0.65062,0.66050,0.67090,0.68100,0.69104,0.70121,0.71137,0.72136,0.73141,0.74113,0.75073,0.76002,0.76953,0.77910,0.78854,0.79781
+0.80712,0.81648,0.82558,0.83461,0.84364,0.85248,0.86123,0.86983,0.87826,0.88632,0.89420,0.90208,0.90960,0.91686,0.92392,0.93049,0.93680,0.94258,0.94806,0.95325
+0.95791,0.96204,0.96584,0.96911,0.97213,0.97486,0.97732,0.97945,0.98152,0.98330,0.98486,0.98629,0.98755,0.98872,0.98980,0.99075,0.99161,0.99235,0.99301,0.99366
+0.99422,0.99472,0.99517,0.99560,0.99596,0.99628,0.99659,0.99688,0.99712,0.99734,0.99757,0.99776,0.99796,0.99812,0.99825,0.99839,0.99851,0.99863,0.99874,0.99883
+0.99890,0.99897,0.99904,0.99910,0.99916,0.99922,0.99928,0.99933,0.99938,0.99942,0.99945,0.99949,0.99952,0.99956,0.99959,0.99962,0.99964,0.99966,0.99968,0.99969
+0.99972,0.99975,0.99977,0.99979,0.99980,0.99981,0.99982,0.99983,0.99985,0.99986,0.99987,0.99988,0.99988,0.99989,0.99990,0.99990,0.99991,0.99992,0.99993,0.99993
+0.99994,0.99996,0.99996,0.99996,0.99997,0.99998,0.99998,0.99998,0.99999,0.99999,1.00000
+pwc1x2fract=0.00022,0.00064,0.00138,0.00286,0.00511,0.00855,0.01313,0.01911,0.02619,0.03464,0.04403,0.05410,0.06503,0.07633,0.08808,0.10031,0.11262,0.12523,0.13785
+0.15067,0.16316,0.17570,0.18850,0.20122,0.21354,0.22595,0.23838,0.25055,0.26272,0.27447,0.28640,0.29812,0.30968,0.32129,0.33284,0.34440,0.35578,0.36702,0.37834
+0.38951,0.40071,0.41190,0.42299,0.43392,0.44488,0.45585,0.46661,0.47739,0.48823,0.49883,0.50949,0.52015,0.53084,0.54152,0.55226,0.56285,0.57320,0.58362,0.59397
+0.60426,0.61441,0.62448,0.63438,0.64467,0.65481,0.66479,0.67484,0.68479,0.69460,0.70413,0.71372,0.72324,0.73255,0.74189,0.75149,0.76090,0.77028,0.77941,0.78841
+0.79750,0.80668,0.81546,0.82415,0.83313,0.84182,0.85042,0.85898,0.86745,0.87557,0.88352,0.89147,0.89914,0.90661,0.91378,0.92076,0.92737,0.93357,0.93931,0.94476
+0.94984,0.95465,0.95906,0.96299,0.96654,0.96977,0.97272,0.97534,0.97765,0.97983,0.98176,0.98349,0.98504,0.98635,0.98760,0.98873,0.98981,0.99074,0.99160,0.99238
+0.99306,0.99370,0.99426,0.99477,0.99525,0.99568,0.99599,0.99634,0.99666,0.99700,0.99727,0.99751,0.99770,0.99791,0.99809,0.99825,0.99840,0.99854,0.99865,0.99875
+0.99885,0.99893,0.99901,0.99907,0.99915,0.99922,0.99927,0.99933,0.99940,0.99944,0.99947,0.99952,0.99955,0.99958,0.99962,0.99965,0.99968,0.99970,0.99972,0.99972
+0.99974,0.99975,0.99977,0.99978,0.99979,0.99980,0.99982,0.99982,0.99984,0.99984,0.99985,0.99987,0.99988,0.99989,0.99990,0.99990,0.99991,0.99992,0.99993,0.99993
+0.99994,0.99994,0.99995,0.99996,0.99996,0.99997,0.99998,0.99999,0.99999,0.99999,1.00000
+pwc1v1fract=0.00031,0.00093,0.00211,0.00401,0.00673,0.01048,0.01519,0.02104,0.02786,0.03549,0.04381,0.05297,0.06258,0.07294,0.08390,0.09507,0.10635,0.11835,0.13030
+0.14282,0.15508,0.16753,0.17983,0.19242,0.20518,0.21781,0.23052,0.24300,0.25564,0.26799,0.28017,0.29224,0.30439,0.31630,0.32826,0.34003,0.35201,0.36408,0.37578
+0.38739,0.39880,0.41065,0.42214,0.43354,0.44479,0.45584,0.46710,0.47825,0.48932,0.50050,0.51151,0.52243,0.53310,0.54376,0.55453,0.56511,0.57576,0.58619,0.59647
+0.60689,0.61712,0.62751,0.63762,0.64758,0.65755,0.66755,0.67742,0.68732,0.69693,0.70650,0.71602,0.72560,0.73510,0.74459,0.75383,0.76315,0.77237,0.78141,0.79045
+0.79967,0.80862,0.81732,0.82589,0.83438,0.84291,0.85133,0.85951,0.86763,0.87559,0.88334,0.89094,0.89842,0.90544,0.91218,0.91860,0.92474,0.93065,0.93612,0.94116
+0.94584,0.95018,0.95408,0.95766,0.96081,0.96371,0.96649,0.96902,0.97140,0.97355,0.97549,0.97731,0.97900,0.98055,0.98199,0.98344,0.98470,0.98589,0.98701,0.98802
+0.98896,0.98982,0.99066,0.99136,0.99201,0.99265,0.99327,0.99383,0.99434,0.99482,0.99526,0.99565,0.99606,0.99641,0.99670,0.99698,0.99729,0.99754,0.99776,0.99799
+0.99817,0.99834,0.99851,0.99865,0.99880,0.99892,0.99903,0.99912,0.99921,0.99929,0.99936,0.99943,0.99949,0.99953,0.99958,0.99963,0.99968,0.99971,0.99975,0.99978
+0.99980,0.99982,0.99984,0.99986,0.99989,0.99990,0.99991,0.99992,0.99993,0.99994,0.99995,0.99996,0.99996,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99998
0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
-pwc1v2fract=0.00062,0.00190,0.00413,0.00715,0.01146,0.01679,0.02296,0.02990,0.03739,0.04615,0.05479,0.06403,0.07372,0.08390,0.09456,0.10514,0.11625,0.12765,0.13926
-0.15096,0.16261,0.17446,0.18642,0.19865,0.21057,0.22246,0.23419,0.24583,0.25766,0.26932,0.28118,0.29295,0.30468,0.31692,0.32876,0.34060,0.35224,0.36348,0.37506
-0.38627,0.39776,0.40899,0.42021,0.43162,0.44260,0.45397,0.46519,0.47634,0.48710,0.49808,0.50888,0.51993,0.53094,0.54163,0.55226,0.56304,0.57340,0.58406,0.59493
-0.60536,0.61600,0.62654,0.63727,0.64739,0.65799,0.66839,0.67815,0.68812,0.69846,0.70865,0.71834,0.72803,0.73782,0.74758,0.75743,0.76701,0.77670,0.78630,0.79565
-0.80497,0.81405,0.82326,0.83235,0.84098,0.85013,0.85903,0.86813,0.87699,0.88545,0.89378,0.90189,0.90973,0.91744,0.92452,0.93111,0.93775,0.94385,0.94951,0.95493
-0.95986,0.96418,0.96813,0.97167,0.97497,0.97768,0.98031,0.98247,0.98457,0.98645,0.98808,0.98942,0.99066,0.99179,0.99278,0.99374,0.99447,0.99512,0.99570,0.99619
-0.99660,0.99701,0.99739,0.99771,0.99804,0.99826,0.99846,0.99862,0.99878,0.99891,0.99900,0.99912,0.99924,0.99933,0.99940,0.99948,0.99953,0.99960,0.99965,0.99967
-0.99971,0.99974,0.99976,0.99979,0.99979,0.99981,0.99983,0.99983,0.99987,0.99989,0.99989,0.99990,0.99993,0.99994,0.99994,0.99994,0.99994,0.99994,0.99995,0.99996
-0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
-1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
-pwc2v2fract=0.00072,0.00211,0.00445,0.00810,0.01280,0.01848,0.02539,0.03301,0.04092,0.04971,0.05906,0.06880,0.07896,0.08934,0.10011,0.11144,0.12252,0.13404,0.14580
-0.15773,0.16940,0.18134,0.19292,0.20474,0.21648,0.22818,0.24008,0.25211,0.26360,0.27540,0.28709,0.29892,0.31128,0.32278,0.33444,0.34620,0.35776,0.36907,0.38061
-0.39189,0.40339,0.41459,0.42560,0.43684,0.44780,0.45883,0.46999,0.48090,0.49189,0.50314,0.51398,0.52481,0.53529,0.54620,0.55701,0.56806,0.57870,0.58929,0.59973
-0.60996,0.62032,0.63057,0.64085,0.65109,0.66095,0.67107,0.68110,0.69097,0.70147,0.71146,0.72145,0.73114,0.74103,0.75062,0.76017,0.76982,0.77917,0.78872,0.79796
-0.80730,0.81647,0.82575,0.83484,0.84360,0.85281,0.86185,0.87062,0.87931,0.88753,0.89618,0.90405,0.91163,0.91903,0.92639,0.93316,0.93938,0.94573,0.95140,0.95644
-0.96102,0.96531,0.96914,0.97262,0.97563,0.97839,0.98086,0.98299,0.98481,0.98658,0.98829,0.98979,0.99094,0.99198,0.99283,0.99367,0.99436,0.99497,0.99561,0.99620
-0.99668,0.99705,0.99742,0.99772,0.99798,0.99822,0.99839,0.99861,0.99877,0.99891,0.99903,0.99915,0.99922,0.99930,0.99936,0.99944,0.99952,0.99958,0.99964,0.99967
-0.99972,0.99976,0.99978,0.99980,0.99982,0.99983,0.99984,0.99985,0.99985,0.99987,0.99987,0.99988,0.99989,0.99989,0.99989,0.99989,0.99991,0.99992,0.99993,0.99993
-0.99993,0.99994,0.99995,0.99996,0.99996,0.99996,0.99996,0.99996,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999
-0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
-pwc2v1fract=0.00084,0.00247,0.00494,0.00836,0.01283,0.01851,0.02521,0.03243,0.04063,0.04924,0.05843,0.06792,0.07826,0.08832,0.09902,0.11006,0.12131,0.13269,0.14428
-0.15584,0.16743,0.17937,0.19130,0.20319,0.21461,0.22649,0.23840,0.25011,0.26198,0.27356,0.28493,0.29688,0.30831,0.31960,0.33136,0.34289,0.35440,0.36569,0.37749
-0.38872,0.40016,0.41137,0.42208,0.43334,0.44447,0.45552,0.46653,0.47771,0.48856,0.49986,0.51068,0.52167,0.53272,0.54318,0.55393,0.56441,0.57523,0.58588,0.59641
-0.60714,0.61781,0.62820,0.63889,0.64967,0.66002,0.67031,0.68060,0.69048,0.70049,0.71043,0.72064,0.73029,0.74007,0.74942,0.75952,0.76942,0.77910,0.78846,0.79803
-0.80740,0.81650,0.82544,0.83455,0.84350,0.85244,0.86116,0.86992,0.87838,0.88677,0.89486,0.90292,0.91064,0.91836,0.92545,0.93231,0.93889,0.94480,0.95050,0.95572
-0.96041,0.96471,0.96862,0.97209,0.97517,0.97794,0.98033,0.98251,0.98440,0.98615,0.98769,0.98895,0.99012,0.99125,0.99217,0.99303,0.99384,0.99456,0.99517,0.99568
-0.99614,0.99660,0.99694,0.99734,0.99765,0.99786,0.99812,0.99830,0.99848,0.99871,0.99886,0.99896,0.99908,0.99918,0.99925,0.99932,0.99941,0.99947,0.99950,0.99956
-0.99959,0.99964,0.99971,0.99973,0.99976,0.99977,0.99979,0.99981,0.99982,0.99983,0.99984,0.99986,0.99986,0.99988,0.99990,0.99991,0.99992,0.99992,0.99993,0.99993
-0.99993,0.99995,0.99995,0.99995,0.99995,0.99996,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998
-0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
-pwc2x2fract=0.00081,0.00243,0.00525,0.00894,0.01410,0.02039,0.02757,0.03558,0.04417,0.05336,0.06304,0.07319,0.08397,0.09498,0.10601,0.11736,0.12854,0.14001,0.15184
-0.16350,0.17524,0.18757,0.19949,0.21101,0.22295,0.23493,0.24709,0.25888,0.27047,0.28222,0.29363,0.30527,0.31716,0.32884,0.34036,0.35176,0.36320,0.37437,0.38585
-0.39725,0.40845,0.41957,0.43089,0.44215,0.45332,0.46437,0.47566,0.48651,0.49751,0.50812,0.51933,0.53020,0.54121,0.55213,0.56289,0.57380,0.58457,0.59514,0.60595
-0.61645,0.62708,0.63720,0.64724,0.65722,0.66719,0.67728,0.68735,0.69746,0.70738,0.71715,0.72707,0.73692,0.74649,0.75633,0.76611,0.77588,0.78529,0.79448,0.80426
-0.81386,0.82319,0.83268,0.84162,0.85067,0.85966,0.86849,0.87760,0.88640,0.89499,0.90306,0.91117,0.91868,0.92599,0.93306,0.93980,0.94566,0.95168,0.95732,0.96225
-0.96678,0.97076,0.97437,0.97773,0.98039,0.98255,0.98480,0.98673,0.98842,0.98978,0.99100,0.99212,0.99310,0.99392,0.99469,0.99530,0.99595,0.99639,0.99674,0.99712
-0.99747,0.99783,0.99806,0.99828,0.99847,0.99866,0.99881,0.99888,0.99901,0.99912,0.99919,0.99928,0.99933,0.99939,0.99945,0.99952,0.99956,0.99959,0.99963,0.99964
-0.99967,0.99970,0.99972,0.99974,0.99974,0.99976,0.99977,0.99978,0.99979,0.99981,0.99982,0.99984,0.99985,0.99986,0.99987,0.99988,0.99989,0.99989,0.99990,0.99991
-0.99991,0.99992,0.99993,0.99993,0.99994,0.99995,0.99995,0.99996,0.99996,0.99996,0.99996,0.99996,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99998
-0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99999,1.00000,1.00000,1.00000
-pwc2x1fract=0.00082,0.00220,0.00465,0.00841,0.01301,0.01898,0.02574,0.03338,0.04193,0.05108,0.06099,0.07103,0.08144,0.09206,0.10295,0.11437,0.12564,0.13689,0.14844
-0.16007,0.17183,0.18386,0.19570,0.20722,0.21904,0.23095,0.24271,0.25422,0.26581,0.27699,0.28845,0.29986,0.31116,0.32254,0.33422,0.34544,0.35699,0.36843,0.37962
-0.39061,0.40220,0.41351,0.42494,0.43574,0.44669,0.45791,0.46885,0.47972,0.49073,0.50126,0.51203,0.52280,0.53343,0.54433,0.55535,0.56604,0.57687,0.58769,0.59806
-0.60865,0.61907,0.62943,0.64003,0.65045,0.66067,0.67106,0.68153,0.69159,0.70150,0.71176,0.72183,0.73174,0.74198,0.75193,0.76170,0.77154,0.78103,0.79062,0.80023
-0.80979,0.81921,0.82851,0.83765,0.84691,0.85583,0.86493,0.87374,0.88205,0.89066,0.89917,0.90726,0.91520,0.92286,0.93021,0.93687,0.94337,0.94931,0.95518,0.96036
-0.96495,0.96936,0.97318,0.97656,0.97947,0.98220,0.98445,0.98640,0.98805,0.98969,0.99093,0.99214,0.99318,0.99405,0.99480,0.99551,0.99613,0.99663,0.99706,0.99735
-0.99767,0.99794,0.99815,0.99841,0.99862,0.99880,0.99894,0.99904,0.99915,0.99921,0.99928,0.99936,0.99940,0.99947,0.99950,0.99953,0.99957,0.99959,0.99962,0.99964
-0.99966,0.99967,0.99969,0.99972,0.99973,0.99974,0.99975,0.99976,0.99977,0.99979,0.99980,0.99980,0.99980,0.99981,0.99982,0.99983,0.99984,0.99984,0.99985,0.99987
-0.99987,0.99987,0.99989,0.99989,0.99990,0.99990,0.99990,0.99991,0.99991,0.99991,0.99992,0.99993,0.99993,0.99993,0.99994,0.99995,0.99995,0.99996,0.99996,0.99997
-0.99997,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000
-pwc2u2fract=0.00054,0.00155,0.00356,0.00654,0.01073,0.01582,0.02154,0.02834,0.03565,0.04393,0.05255,0.06192,0.07160,0.08151,0.09176,0.10228,0.11339,0.12483,0.13603
-0.14742,0.15905,0.17110,0.18324,0.19528,0.20706,0.21922,0.23059,0.24280,0.25439,0.26644,0.27804,0.28996,0.30157,0.31338,0.32477,0.33633,0.34770,0.35901,0.37025
-0.38162,0.39281,0.40364,0.41441,0.42561,0.43724,0.44852,0.46005,0.47156,0.48243,0.49314,0.50445,0.51556,0.52667,0.53778,0.54867,0.55930,0.56992,0.58096,0.59157
-0.60241,0.61271,0.62328,0.63373,0.64436,0.65458,0.66473,0.67477,0.68475,0.69522,0.70517,0.71518,0.72494,0.73476,0.74463,0.75433,0.76396,0.77365,0.78305,0.79243
-0.80223,0.81178,0.82122,0.83047,0.83972,0.84890,0.85778,0.86677,0.87565,0.88436,0.89263,0.90112,0.90895,0.91663,0.92419,0.93158,0.93838,0.94489,0.95069,0.95587
-0.96062,0.96494,0.96876,0.97243,0.97575,0.97865,0.98119,0.98344,0.98530,0.98708,0.98861,0.99005,0.99132,0.99245,0.99343,0.99427,0.99490,0.99553,0.99614,0.99661
-0.99701,0.99741,0.99772,0.99798,0.99822,0.99844,0.99865,0.99883,0.99896,0.99907,0.99920,0.99930,0.99939,0.99945,0.99952,0.99958,0.99963,0.99968,0.99975,0.99978
-0.99981,0.99985,0.99987,0.99990,0.99992,0.99992,0.99993,0.99994,0.99994,0.99995,0.99996,0.99996,0.99996,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99998
-0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999
-0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000,1.00000
-pwc2u1fract=0.00095,0.00248,0.00491,0.00823,0.01273,0.01824,0.02456,0.03154,0.03924,0.04750,0.05628,0.06542,0.07527,0.08508,0.09560,0.10650,0.11771,0.12897,0.14029
-0.15185,0.16372,0.17520,0.18708,0.19902,0.21089,0.22313,0.23513,0.24707,0.25897,0.27094,0.28297,0.29483,0.30673,0.31845,0.32997,0.34196,0.35360,0.36487,0.37657
-0.38812,0.39964,0.41112,0.42250,0.43393,0.44518,0.45617,0.46717,0.47846,0.48991,0.50093,0.51192,0.52281,0.53346,0.54452,0.55554,0.56642,0.57707,0.58763,0.59801
-0.60844,0.61913,0.62963,0.64045,0.65037,0.66069,0.67083,0.68100,0.69109,0.70120,0.71097,0.72109,0.73081,0.74088,0.75062,0.76037,0.77025,0.77967,0.78967,0.79936
-0.80889,0.81784,0.82699,0.83629,0.84549,0.85457,0.86332,0.87186,0.88054,0.88863,0.89684,0.90487,0.91274,0.92023,0.92742,0.93429,0.94081,0.94689,0.95232,0.95752
-0.96212,0.96622,0.97002,0.97338,0.97632,0.97923,0.98175,0.98384,0.98569,0.98736,0.98894,0.99031,0.99148,0.99246,0.99331,0.99404,0.99482,0.99544,0.99606,0.99650
-0.99699,0.99731,0.99764,0.99794,0.99819,0.99842,0.99862,0.99882,0.99896,0.99909,0.99920,0.99932,0.99941,0.99946,0.99952,0.99957,0.99961,0.99963,0.99967,0.99972
-0.99975,0.99977,0.99980,0.99983,0.99985,0.99986,0.99987,0.99988,0.99989,0.99989,0.99991,0.99992,0.99993,0.99993,0.99993,0.99994,0.99995,0.99995,0.99995,0.99996
-0.99996,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998
-0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000
+pwc1v2fract=0.00028,0.00081,0.00179,0.00354,0.00614,0.00982,0.01463,0.02037,0.02752,0.03558,0.04427,0.05390,0.06422,0.07489,0.08617,0.09773,0.10965,0.12172,0.13406
+0.14669,0.15936,0.17203,0.18478,0.19738,0.20994,0.22255,0.23504,0.24736,0.25948,0.27149,0.28348,0.29544,0.30739,0.31905,0.33068,0.34222,0.35383,0.36541,0.37678
+0.38799,0.39935,0.41057,0.42168,0.43278,0.44404,0.45513,0.46609,0.47693,0.48774,0.49845,0.50914,0.52005,0.53071,0.54113,0.55153,0.56197,0.57247,0.58277,0.59304
+0.60324,0.61353,0.62341,0.63354,0.64353,0.65355,0.66337,0.67324,0.68280,0.69241,0.70212,0.71165,0.72137,0.73069,0.74006,0.74951,0.75862,0.76759,0.77681,0.78590
+0.79463,0.80355,0.81221,0.82085,0.82945,0.83783,0.84599,0.85415,0.86209,0.87013,0.87792,0.88543,0.89283,0.89990,0.90669,0.91326,0.91974,0.92576,0.93145,0.93685
+0.94169,0.94629,0.95053,0.95434,0.95781,0.96101,0.96392,0.96646,0.96891,0.97114,0.97320,0.97513,0.97688,0.97861,0.98010,0.98150,0.98288,0.98413,0.98531,0.98640
+0.98741,0.98832,0.98915,0.98995,0.99076,0.99148,0.99211,0.99275,0.99326,0.99376,0.99427,0.99478,0.99520,0.99560,0.99596,0.99625,0.99658,0.99687,0.99714,0.99739
+0.99760,0.99783,0.99803,0.99823,0.99840,0.99856,0.99870,0.99884,0.99895,0.99905,0.99915,0.99924,0.99933,0.99941,0.99948,0.99952,0.99957,0.99962,0.99966,0.99970
+0.99972,0.99976,0.99978,0.99980,0.99984,0.99986,0.99988,0.99990,0.99991,0.99992,0.99994,0.99995,0.99995,0.99996,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998
+0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000
+pwc2v2fract=0.00023,0.00073,0.00168,0.00325,0.00569,0.00914,0.01352,0.01890,0.02550,0.03287,0.04091,0.04955,0.05866,0.06824,0.07830,0.08874,0.09941,0.11051,0.12192
+0.13331,0.14500,0.15684,0.16859,0.18046,0.19265,0.20484,0.21702,0.22913,0.24123,0.25349,0.26560,0.27777,0.28974,0.30145,0.31333,0.32511,0.33677,0.34847,0.36018
+0.37202,0.38373,0.39532,0.40690,0.41851,0.42998,0.44163,0.45300,0.46427,0.47560,0.48706,0.49822,0.50929,0.52047,0.53158,0.54265,0.55369,0.56479,0.57574,0.58636
+0.59726,0.60795,0.61843,0.62909,0.63961,0.65025,0.66052,0.67114,0.68164,0.69211,0.70250,0.71277,0.72286,0.73310,0.74284,0.75282,0.76276,0.77233,0.78218,0.79183
+0.80146,0.81108,0.82062,0.82994,0.83912,0.84836,0.85746,0.86638,0.87509,0.88385,0.89245,0.90076,0.90884,0.91656,0.92405,0.93124,0.93784,0.94396,0.94975,0.95502
+0.95993,0.96423,0.96829,0.97187,0.97505,0.97798,0.98051,0.98269,0.98471,0.98650,0.98804,0.98947,0.99068,0.99177,0.99274,0.99361,0.99442,0.99507,0.99563,0.99616
+0.99660,0.99703,0.99738,0.99769,0.99795,0.99821,0.99843,0.99862,0.99879,0.99891,0.99904,0.99914,0.99922,0.99932,0.99939,0.99947,0.99953,0.99959,0.99964,0.99968
+0.99971,0.99975,0.99976,0.99979,0.99981,0.99982,0.99984,0.99985,0.99986,0.99987,0.99988,0.99988,0.99990,0.99991,0.99991,0.99992,0.99993,0.99993,0.99993,0.99994
+0.99994,0.99995,0.99995,0.99995,0.99996,0.99996,0.99996,0.99996,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99998
+0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000
+pwc2v1fract=0.00029,0.00087,0.00190,0.00358,0.00613,0.00944,0.01382,0.01926,0.02577,0.03293,0.04092,0.04961,0.05884,0.06838,0.07846,0.08876,0.09943,0.11026,0.12129
+0.13254,0.14399,0.15577,0.16742,0.17925,0.19118,0.20316,0.21545,0.22731,0.23924,0.25122,0.26304,0.27497,0.28672,0.29832,0.30999,0.32167,0.33346,0.34520,0.35689
+0.36860,0.38016,0.39165,0.40321,0.41480,0.42628,0.43780,0.44911,0.46070,0.47208,0.48323,0.49457,0.50582,0.51737,0.52846,0.53960,0.55068,0.56185,0.57297,0.58390
+0.59504,0.60586,0.61672,0.62747,0.63826,0.64905,0.65963,0.66997,0.68039,0.69089,0.70132,0.71169,0.72186,0.73203,0.74212,0.75223,0.76225,0.77214,0.78205,0.79188
+0.80180,0.81147,0.82098,0.83062,0.83982,0.84897,0.85800,0.86688,0.87571,0.88435,0.89262,0.90103,0.90905,0.91679,0.92411,0.93121,0.93772,0.94376,0.94950,0.95495
+0.95983,0.96418,0.96803,0.97154,0.97464,0.97742,0.97991,0.98214,0.98409,0.98579,0.98738,0.98874,0.98998,0.99109,0.99207,0.99291,0.99369,0.99436,0.99499,0.99557
+0.99609,0.99652,0.99689,0.99724,0.99756,0.99785,0.99808,0.99831,0.99849,0.99866,0.99878,0.99891,0.99903,0.99912,0.99920,0.99929,0.99937,0.99943,0.99948,0.99952
+0.99957,0.99960,0.99964,0.99967,0.99970,0.99972,0.99975,0.99976,0.99978,0.99981,0.99983,0.99985,0.99986,0.99987,0.99988,0.99989,0.99990,0.99991,0.99991,0.99992
+0.99993,0.99993,0.99994,0.99994,0.99994,0.99994,0.99995,0.99996,0.99996,0.99996,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998
+0.99998,0.99998,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000
+pwc2x2fract=0.00026,0.00080,0.00179,0.00345,0.00617,0.00998,0.01492,0.02113,0.02823,0.03602,0.04475,0.05401,0.06371,0.07395,0.08446,0.09525,0.10636,0.11763,0.12927
+0.14083,0.15232,0.16454,0.17647,0.18852,0.20074,0.21289,0.22485,0.23677,0.24866,0.26038,0.27201,0.28369,0.29520,0.30680,0.31847,0.33015,0.34179,0.35340,0.36521
+0.37682,0.38837,0.39995,0.41168,0.42332,0.43466,0.44606,0.45717,0.46881,0.47995,0.49135,0.50249,0.51352,0.52473,0.53566,0.54659,0.55753,0.56878,0.57965,0.59044
+0.60114,0.61199,0.62246,0.63303,0.64371,0.65430,0.66469,0.67521,0.68561,0.69604,0.70655,0.71687,0.72709,0.73739,0.74765,0.75767,0.76755,0.77749,0.78725,0.79700
+0.80685,0.81636,0.82596,0.83550,0.84511,0.85450,0.86377,0.87289,0.88179,0.89064,0.89921,0.90748,0.91535,0.92298,0.93034,0.93740,0.94414,0.95032,0.95583,0.96107
+0.96579,0.96992,0.97356,0.97693,0.97991,0.98247,0.98454,0.98640,0.98798,0.98947,0.99069,0.99183,0.99275,0.99356,0.99422,0.99478,0.99529,0.99573,0.99618,0.99653
+0.99685,0.99709,0.99732,0.99752,0.99767,0.99784,0.99795,0.99807,0.99817,0.99827,0.99835,0.99840,0.99848,0.99856,0.99862,0.99867,0.99872,0.99876,0.99880,0.99885
+0.99889,0.99894,0.99900,0.99905,0.99908,0.99911,0.99913,0.99917,0.99920,0.99923,0.99927,0.99930,0.99933,0.99936,0.99938,0.99941,0.99943,0.99945,0.99948,0.99950
+0.99951,0.99954,0.99955,0.99956,0.99958,0.99959,0.99960,0.99963,0.99965,0.99967,0.99969,0.99971,0.99972,0.99974,0.99975,0.99976,0.99977,0.99978,0.99980,0.99982
+0.99984,0.99986,0.99988,0.99989,0.99992,0.99993,0.99994,0.99996,0.99997,0.99999,1.00000
+pwc2x1fract=0.00027,0.00080,0.00180,0.00363,0.00629,0.01011,0.01505,0.02131,0.02870,0.03685,0.04576,0.05503,0.06479,0.07493,0.08566,0.09660,0.10768,0.11909,0.13070
+0.14223,0.15393,0.16581,0.17732,0.18912,0.20110,0.21301,0.22492,0.23644,0.24851,0.26028,0.27212,0.28372,0.29547,0.30718,0.31883,0.33056,0.34233,0.35374,0.36543
+0.37698,0.38845,0.39985,0.41131,0.42268,0.43429,0.44575,0.45708,0.46832,0.47955,0.49065,0.50180,0.51293,0.52376,0.53492,0.54582,0.55680,0.56791,0.57894,0.58978
+0.60060,0.61129,0.62200,0.63254,0.64308,0.65347,0.66407,0.67450,0.68509,0.69540,0.70569,0.71587,0.72603,0.73629,0.74671,0.75692,0.76690,0.77693,0.78677,0.79663
+0.80637,0.81609,0.82577,0.83525,0.84461,0.85391,0.86307,0.87218,0.88116,0.89003,0.89862,0.90708,0.91524,0.92291,0.93029,0.93741,0.94390,0.95001,0.95565,0.96086
+0.96565,0.96997,0.97348,0.97683,0.97966,0.98221,0.98438,0.98630,0.98796,0.98937,0.99055,0.99163,0.99244,0.99321,0.99388,0.99449,0.99502,0.99549,0.99588,0.99621
+0.99653,0.99682,0.99703,0.99718,0.99737,0.99752,0.99764,0.99776,0.99787,0.99796,0.99805,0.99812,0.99820,0.99826,0.99833,0.99838,0.99845,0.99851,0.99855,0.99859
+0.99865,0.99868,0.99872,0.99876,0.99880,0.99884,0.99888,0.99891,0.99895,0.99897,0.99901,0.99905,0.99907,0.99911,0.99913,0.99916,0.99919,0.99922,0.99926,0.99928
+0.99931,0.99933,0.99936,0.99939,0.99942,0.99944,0.99947,0.99950,0.99952,0.99955,0.99957,0.99959,0.99961,0.99964,0.99965,0.99968,0.99970,0.99972,0.99974,0.99976
+0.99978,0.99981,0.99984,0.99986,0.99988,0.99990,0.99992,0.99994,0.99996,0.99998,1.00000
+pwc2u2fract=0.00024,0.00071,0.00161,0.00318,0.00551,0.00926,0.01389,0.01939,0.02592,0.03338,0.04140,0.05001,0.05906,0.06851,0.07822,0.08849,0.09928,0.11015,0.12112
+0.13250,0.14427,0.15599,0.16776,0.17963,0.19150,0.20317,0.21545,0.22757,0.23940,0.25165,0.26365,0.27578,0.28760,0.29946,0.31144,0.32340,0.33524,0.34691,0.35857
+0.37011,0.38163,0.39319,0.40470,0.41617,0.42745,0.43898,0.45030,0.46155,0.47295,0.48428,0.49566,0.50698,0.51809,0.52934,0.54043,0.55151,0.56265,0.57332,0.58418
+0.59491,0.60559,0.61626,0.62666,0.63747,0.64816,0.65886,0.66944,0.68011,0.69063,0.70095,0.71134,0.72173,0.73205,0.74199,0.75220,0.76217,0.77201,0.78190,0.79167
+0.80143,0.81114,0.82083,0.83022,0.83971,0.84912,0.85848,0.86757,0.87670,0.88560,0.89451,0.90315,0.91135,0.91912,0.92676,0.93388,0.94064,0.94702,0.95284,0.95805
+0.96268,0.96716,0.97102,0.97445,0.97751,0.98030,0.98281,0.98492,0.98679,0.98844,0.98981,0.99113,0.99229,0.99333,0.99425,0.99503,0.99568,0.99625,0.99677,0.99719
+0.99755,0.99789,0.99819,0.99842,0.99863,0.99881,0.99896,0.99907,0.99920,0.99928,0.99937,0.99945,0.99951,0.99957,0.99963,0.99967,0.99971,0.99973,0.99976,0.99978
+0.99979,0.99981,0.99983,0.99985,0.99986,0.99987,0.99988,0.99989,0.99990,0.99991,0.99992,0.99993,0.99993,0.99994,0.99995,0.99995,0.99995,0.99996,0.99996,0.99996
+0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99998,0.99999,0.99999,0.99999,0.99999
+0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000,1.00000,1.00000
+pwc2u1fract=0.00023,0.00073,0.00175,0.00342,0.00597,0.00943,0.01380,0.01919,0.02553,0.03252,0.04019,0.04848,0.05729,0.06638,0.07591,0.08578,0.09621,0.10663,0.11746
+0.12873,0.13986,0.15159,0.16331,0.17528,0.18715,0.19911,0.21129,0.22338,0.23538,0.24754,0.25959,0.27177,0.28397,0.29602,0.30799,0.31989,0.33175,0.34347,0.35537
+0.36716,0.37886,0.39041,0.40192,0.41356,0.42529,0.43705,0.44847,0.45988,0.47111,0.48266,0.49401,0.50536,0.51676,0.52806,0.53907,0.55019,0.56136,0.57222,0.58327
+0.59418,0.60526,0.61614,0.62674,0.63735,0.64798,0.65888,0.66975,0.68023,0.69060,0.70094,0.71134,0.72170,0.73200,0.74212,0.75236,0.76243,0.77241,0.78252,0.79220
+0.80229,0.81215,0.82160,0.83112,0.84064,0.85020,0.85936,0.86839,0.87713,0.88595,0.89465,0.90272,0.91094,0.91876,0.92620,0.93334,0.94010,0.94623,0.95200,0.95724
+0.96216,0.96668,0.97057,0.97388,0.97693,0.97970,0.98201,0.98419,0.98607,0.98775,0.98920,0.99054,0.99168,0.99269,0.99363,0.99443,0.99513,0.99572,0.99631,0.99677
+0.99717,0.99752,0.99783,0.99810,0.99834,0.99855,0.99873,0.99887,0.99901,0.99915,0.99924,0.99932,0.99941,0.99948,0.99952,0.99958,0.99962,0.99964,0.99967,0.99970
+0.99973,0.99976,0.99979,0.99980,0.99981,0.99982,0.99984,0.99985,0.99987,0.99987,0.99988,0.99988,0.99989,0.99990,0.99990,0.99991,0.99991,0.99992,0.99992,0.99992
+0.99993,0.99994,0.99994,0.99994,0.99994,0.99995,0.99995,0.99996,0.99996,0.99996,0.99996,0.99997,0.99997,0.99997,0.99997,0.99997,0.99997,0.99998,0.99998,0.99998
+0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,0.99999,1.00000,1.00000,1.00000
diff --git a/PARAM/SHMS/DC/pdc_cuts.param b/PARAM/SHMS/DC/pdc_cuts.param
index f621dbb8c23fbc29496588c60d7f17d64727b833..60f3c91e5eee313ac8b5150b452b2b8a7660a485 100644
--- a/PARAM/SHMS/DC/pdc_cuts.param
+++ b/PARAM/SHMS/DC/pdc_cuts.param
@@ -16,5 +16,5 @@ pdc_fix_lr = 1
pdc_fix_propcorr = 1
; Zero time correction for each plane in ns that is added to TDC time.
-pdc_plane_time_zero = 1270.0, 1270.0, 1270.0, 1270.0, 1270.0, 1270.0
- 1270.0, 1270.0, 1270.0, 1270.0, 1270.0, 1270.0
\ No newline at end of file
+pdc_plane_time_zero = 1270.0+25., 1270.0+25., 1270.0+25., 1270.0+25., 1270.0+25., 1270.0+25.
+ 1270.0+25., 1270.0+25., 1270.0+25., 1270.0+25., 1270.0+25., 1270.0+25.
\ No newline at end of file
diff --git a/PARAM/SHMS/DC/pdc_tzero_per_wire.param b/PARAM/SHMS/DC/pdc_tzero_per_wire.param
index 2e5468c3ae38156673f9bc6e0aea1d1e6bfc96fc..b8c1100e40d0093eafb9540d02dbc5ae0136df00 100644
--- a/PARAM/SHMS/DC/pdc_tzero_per_wire.param
+++ b/PARAM/SHMS/DC/pdc_tzero_per_wire.param
@@ -1,88 +1,88 @@
ptzero1u1=
--39.5,-39.500000,-39.500000,-39.500000,-39.500000,-39.500000,-39.500000,-39.500000,-39.500000,-39.500000,-39.500000,-39.500000, -39.500000, -39.500000, -39.500000, -10.369391
--10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -10.369391, -8.061662
--8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -8.061662, -6.985772
--6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -6.985772, -4.926242
--4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -4.926242, -5.420486
--5.420486, -5.420486, -5.420486, -5.420486, -5.420486, -5.420486, -5.420486, -5.420486, -5.420486, -5.420486, -5.420486, -5.420486, -5.420486, -5.420486, -5.420486, 8.500000
-8.500000, 8.500000, 8.500000, 8.500000, 8.500000, 8.500000, 8.500000, 8.500000, 8.500000, 8.500000, 8.500000
+1.52902,1.529021,1.529021,1.529021,1.529021,1.529021,1.529021,1.529021,1.529021,1.529021,1.529021,1.529021, 1.529021, 1.529021, 1.529021, 1.529021
+1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 0.525952, 1.305435, -5.998182, 1.116718
+1.638151, 1.483262, -0.570615, 1.399185, 1.087017, 1.614261, 0.547199, 2.310643, 1.098726, 1.105453, 1.539726, 1.118731, 1.601656, 1.457803, 1.136658, 1.326868
+1.548980, 1.218060, 1.285568, 1.680600, 1.293641, 1.243623, 5.504873, 1.063279, 1.435855, 2.989726, 3.040628, 1.200233, 2.150229, 1.205696, 3.058767, 6.406323
+6.552358, 6.710605, 6.432281, 5.943831, 6.035220, 5.946856, 5.422809, 6.431293, 5.882951, 6.573977, 6.530640, 6.806742, 6.287776, 6.933642, 6.853186, 5.282264
+6.269040, 5.647329, 6.075678, 5.549724, 6.710602, 5.598231, 6.138399, 5.703076, 6.444288, 5.490271, 5.356547, 5.150280, 6.269271, 5.126659, 1.529021, 1.529021
+1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021, 1.529021
ptzero1u2=
-0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000, -11.308881, -11.308881, -11.308881, -11.308881
--11.308881, -11.308881, -11.308881, -11.308881, -11.308881, -11.308881, -11.308881, -11.308881, -11.308881, -11.308881, -11.308881, -11.308881, -7.758043, -7.758043, -7.758043, -7.758043
--7.758043, -7.758043, -7.758043, -7.758043, -7.758043, -7.758043, -7.758043, -7.758043, -7.758043, -7.758043, -7.758043, -7.758043, -6.455573, -6.455573, -6.455573, -6.455573
--6.455573, -6.455573, -6.455573, -6.455573, -6.455573, -6.455573, -6.455573, -6.455573, -6.455573, -6.455573, -6.455573, -6.455573, -4.658513, -4.658513, -4.658513, -4.658513
--4.658513, -4.658513, -4.658513, -4.658513, -4.658513, -4.658513, -4.658513, -4.658513, -4.658513, -4.658513, -4.658513, -4.658513, -4.326431, -4.326431, -4.326431, -4.326431
--4.326431, -4.326431, -4.326431, -4.326431, -4.326431, -4.326431, -4.326431, -4.326431, -4.326431, -4.326431, -4.326431, -4.326431, 0.500000, 0.500000, 0.500000, 0.500000
-0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000
+1.763153,1.763153,1.763153,1.763153,1.763153,1.763153,1.763153,1.763153,1.763153,1.763153,1.763153,1.763153, 1.763153, 1.763153, 1.763153, 1.763153
+1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, -0.096313, 3.831437, 1.519213, -6.055176, 0.964765
+0.078088, 1.893982, 1.226170, 0.954987, 1.262806, 2.795397, 1.035986, 1.311998, 1.742272, 2.882305, 1.373889, 1.538283, 3.093388, 3.512789, 3.103921, 2.436050
+4.803575, 1.556570, 4.533544, 1.239494, 3.106760, 1.241117, 4.167912, 4.226269, 4.976883, 4.593296, 4.991517, 4.534688, 6.764721, 6.916166, 6.779285, 6.338387
+6.887624, 6.622249, 6.486093, 6.353469, 3.702167, 3.480341, 1.995802, 5.717205, 6.025848, 5.082450, 5.821265, 4.971853, 6.243550, 6.893235, 6.677124, 6.916471
+1.763153, 5.216880, 6.459876, 5.993356, 6.579062, 6.436197, 5.736744, 2.659127, 5.448535, 6.217736, 6.237770, 4.594265, 5.996163, 1.763153, 1.763153, 1.763153
+1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153, 1.763153
ptzero1x1=
--12.916306,-12.916306,-12.916306,-12.916306,-12.916306,-12.916306,-12.916306,-12.916306,-12.916306,-12.916306,-12.916306,-12.916306, -12.916306, -12.916306, -12.916306, -12.916306
--10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785, -10.515785
--9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843, -9.069843
--4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292, -4.424292
--2.686051, -2.686051, -2.686051, -2.686051, -2.686051, -2.686051, -2.686051, -2.686051, -2.686051, -2.686051, -2.686051, -2.686051, -2.686051, -2.686051, -2.686051
+-3.154830,1.480750,-3.095277,-3.223198,-7.137494,-1.969494,-2.885322,-1.419941,-2.430866,-2.680580,-2.641493,-0.897141, -2.500421, -1.918847, -2.319730, -2.696559
+-2.687789, -1.090406, -2.609650, -0.013375, 0.064451, -2.372672, 0.009082, -0.205309, -2.371646, -2.795759, -0.947483, -1.989119, -2.621868, 0.100318, 0.158518, 3.873402
+1.095438, 1.672976, 1.223903, 1.560886, 1.275526, 1.025357, 1.037036, 0.968371, 1.048376, 0.650174, 0.977363, 1.059724, 0.996023, 0.769283, 1.128885, 0.417334
+4.998463, 6.399080, 5.908559, 6.180740, 3.437791, 1.240560, 3.379566, 6.116218, 6.082965, 5.723584, 5.932669, 6.291542, 5.915471, 6.105960, 6.319942, 6.572632
+10.195358, 10.849953, 10.578311, 10.614595, 10.318699, 10.373919, 10.480983, 10.171358, 10.651211, 10.114174, 1.480750, 10.296678, 10.059670, 10.214381, 10.029387
ptzero1x2=
--4.942948,-4.942948,-4.942948,-4.942948,-4.942948,-4.942948,-4.942948,-4.942948,-4.942948,-4.942948,-4.942948,-4.942948, -4.942948, -4.942948, -4.942948, -5.024766
--5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -5.024766, -12.557562
--12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -12.557562, -9.303682
--9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -9.303682, -6.715198
--6.715198, -6.715198, -6.715198, -6.715198, -6.715198, -6.715198, -6.715198, -6.715198, -6.715198, -6.715198, -6.715198, -6.715198, -6.715198, -6.715198, -6.715198
+0.456334,-5.061177,6.180394,5.980235,6.404839,6.605609,6.165597,7.019074,6.203959,6.447222,6.421369,5.221437, 6.006231, 6.451736, 2.988468, 2.421515
+3.618889, 5.089564, 3.095516, 1.425321, 5.043257, 3.237966, 1.595078, 1.460048, 1.978942, 4.949522, 1.580090, 3.316987, 6.057656, 6.139035, 4.812145, -3.025917
+-2.912483, -2.980344, -2.995572, -2.648855, -2.979129, -2.974026, -2.763520, -2.696015, -2.622223, -2.748264, -2.711139, -2.889996, -2.772591, -2.589832, -2.776683, 1.203121
+2.781642, 1.140525, 1.130486, 1.056949, 1.442509, 0.972618, 1.103074, 0.995657, 1.156127, 0.889344, 0.875748, 0.997467, 0.936447, 0.942678, 0.803273, 1.328227
+2.015238, 1.844625, 1.870302, 1.336724, 1.285018, 2.534963, 1.580153, 3.263464, 1.310446, 3.090777, 1.310836, 3.883932, 2.251403, 1.912969, 3.049926
ptzero1v1=
-10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000, 10.500000, 10.500000, 10.500000, -7.044793
--7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -7.044793, -4.272241
--4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -4.272241, -0.005083
--0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -0.005083, -12.328551
--12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -12.328551, -11.327850
--11.327850, -11.327850, -11.327850, -11.327850, -11.327850, -11.327850, -11.327850, -11.327850, -11.327850, -11.327850, -11.327850, -11.327850, -11.327850, -11.327850, -11.327850, 0.500000
-0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000
+0.946899,0.946899,0.946899,0.946899,0.946899,0.946899,0.946899,0.946899,0.946899,0.946899,0.946899,0.946899, 0.946899, 0.946899, 0.946899, 0.946899
+0.946899, 0.946899, 0.946899, 0.946899, 2.619213, 2.403683, 3.739327, 5.532697, 5.759145, 4.750991, -0.791652, 5.689267, 6.476661, 5.101330, 5.390834, 6.644990
+6.933839, 5.729612, 6.177362, 5.379808, 6.328580, 5.952833, 6.600771, 6.860278, 6.603330, 6.588670, 6.753969, 6.947391, 7.046556, 6.985648, 6.789586, 10.473991
+10.500068, 10.581834, 10.522476, 10.792123, 10.801564, 10.881923, 10.708145, 10.543764, 10.818866, 10.806433, 10.532482, 10.834251, 10.925639, 11.027251, 10.793939, -2.652250
+-2.726418, -1.863076, -2.414452, -2.789977, -2.904353, -2.668752, -2.911921, -2.783635, -2.764098, -0.432582, -0.552787, -0.651940, 0.405501, 0.123885, -0.252836, 0.496863
+1.152660, 0.098707, 0.492182, 0.623931, 0.463947, 0.835594, 0.574142, 0.100038, 0.646040, 0.515299, 0.325089, 0.866844, -3.633932, 0.785656, 0.712226, -1.074577
+-10.841377, 3.154530, 0.946899, 0.946899, 0.946899, 0.946899, 0.946899, 0.946899, 0.946899, 0.946899, 0.946899
ptzero1v2=
--9.500000,-9.500000,-9.500000,-9.500000,-9.500000,-9.500000,-9.500000,-9.500000,-9.500000,-9.500000,-9.500000,-9.500000, -5.331440, -5.331440, -5.331440, -5.331440
--5.331440, -5.331440, -5.331440, -5.331440, -5.331440, -5.331440, -5.331440, -5.331440, -5.331440, -5.331440, -5.331440, -5.331440, -2.089978, -2.089978, -2.089978, -2.089978
--2.089978, -2.089978, -2.089978, -2.089978, -2.089978, -2.089978, -2.089978, -2.089978, -2.089978, -2.089978, -2.089978, -2.089978, -9.739192, -9.739192, -9.739192, -9.739192
--9.739192, -9.739192, -9.739192, -9.739192, -9.739192, -9.739192, -9.739192, -9.739192, -9.739192, -9.739192, -9.739192, -9.739192, -10.597685, -10.597685, -10.597685, -10.597685
--10.597685, -10.597685, -10.597685, -10.597685, -10.597685, -10.597685, -10.597685, -10.597685, -10.597685, -10.597685, -10.597685, -10.597685, -9.044861, -9.044861, -9.044861, -9.044861
--9.044861, -9.044861, -9.044861, -9.044861, -9.044861, -9.044861, -9.044861, -9.044861, -9.044861, -9.044861, -9.044861, -9.044861, 0.500000, 0.500000, 0.500000, 0.500000
-0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000
+0.898142,0.898142,0.898142,0.898142,0.898142,0.898142,0.898142,0.898142,0.898142,0.898142,0.898142,0.898142, 0.898142, 0.898142, 0.898142, 0.898142
+0.898142, 0.898142, 0.898142, 0.898142, 1.696055, 4.981300, -3.016886, 5.885493, 6.929526, 6.006335, 7.258746, 4.779478, 9.827063, 10.398898, 10.148597, 9.930512
+7.931487, 7.290425, 7.317546, 9.606289, 7.522390, 8.709385, 9.044330, 7.608444, 8.367550, 7.446698, 10.166363, 7.326835, 0.963758, 1.114142, 1.074646, 1.077438
+1.029586, 1.060756, 1.044395, 0.946637, 1.121889, 0.989587, 1.131963, 0.987676, 1.014537, 0.939265, 2.392773, 1.018892, -0.853074, 0.858433, 0.713720, 0.615978
+0.507678, 0.901347, -2.119677, 0.681747, -2.378551, -0.048696, -2.009301, 0.364120, -2.643128, -0.554151, 0.520012, 0.352202, 1.847152, 1.583318, 3.145889, 3.039011
+1.245815, 1.095442, 1.714022, 1.044420, 2.991210, 1.013001, 1.466344, 1.152367, 1.644638, 2.396464, 1.139906, 1.176078, 2.879386, 5.646422, 4.155213, 3.494692
+-2.812901, 2.784931, 0.898142, 0.898142, 0.898142, 0.898142, 0.898142, 0.898142, 0.898142, 0.898142, 0.898142
ptzero2v2=
-0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000,0.500000, -9.285841, -9.285841, -9.285841, -9.285841
--9.285841, -9.285841, -9.285841, -9.285841, -9.285841, -9.285841, -9.285841, -9.285841, -9.285841, -9.285841, -9.285841, -9.285841, -1.376703, -1.376703, -1.376703, -1.376703
--1.376703, -1.376703, -1.376703, -1.376703, -1.376703, -1.376703, -1.376703, -1.376703, -1.376703, -1.376703, -1.376703, -1.376703, -1.040012, -1.040012, -1.040012, -1.040012
--1.040012, -1.040012, -1.040012, -1.040012, -1.040012, -1.040012, -1.040012, -1.040012, -1.040012, -1.040012, -1.040012, -1.040012, -5.686772, -5.686772, -5.686772, -5.686772
--5.686772, -5.686772, -5.686772, -5.686772, -5.686772, -5.686772, -5.686772, -5.686772, -5.686772, -5.686772, -5.686772, -5.686772, -2.568984, -2.568984, -2.568984, -2.568984
--2.568984, -2.568984, -2.568984, -2.568984, -2.568984, -2.568984, -2.568984, -2.568984, -2.568984, -2.568984, -2.568984, -2.568984, 0.500000, 0.500000, 0.500000, 0.500000
-0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000
+1.040384,1.040384,1.040384,1.040384,1.040384,1.040384,1.040384,1.040384,1.040384,1.040384,1.040384,1.040384, 1.040384, 1.040384, 1.040384, 1.040384
+1.040384, 1.040384, 1.040384, 1.040384, 1.040384, 1.040384, 1.040384, 1.040384, 1.040384, 0.145205, -6.272351, -0.217602, 9.227966, 10.150258, -0.619881, 10.616746
+10.161974, 7.447114, 8.156372, 9.129576, 7.154031, 7.083168, 8.296653, 6.985401, 7.102942, 7.110971, 7.323840, 7.034116, 7.316284, 10.728772, 10.784091, 10.783983
+10.476288, 10.465225, 10.314858, 7.316211, 7.334376, 7.256112, 10.034234, 10.446094, 7.544653, 9.803640, 7.442765, 10.663237, 4.719395, 5.178335, 5.379860, 1.274255
+5.709029, 1.744484, 4.274224, 3.395311, 3.965919, 3.121720, 2.131215, 3.046030, 4.581349, 1.932013, 3.168651, 5.854672, 8.440849, 8.889529, 7.830669, 8.561265
+7.961898, 7.562712, 7.079642, 7.245170, 6.497921, 6.849663, 6.777684, 7.046200, 4.802990, 2.283754, 6.793699, 6.019329, 8.144863, 9.853396, 7.681417, 8.681220
+6.907574, 1.040384, 1.040384, 1.040384, 1.040384, 1.040384, 1.040384, 1.040384, 1.040384, 1.040384, 1.040384
ptzero2v1=
-10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000,10.500000, 10.500000, 10.500000, 10.500000, -12.372834
--12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -12.372834, -1.115992
--1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -1.115992, -0.799013
--0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -0.799013, -4.392683
--4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -4.392683, -5.659496
--5.659496, -5.659496, -5.659496, -5.659496, -5.659496, -5.659496, -5.659496, -5.659496, -5.659496, -5.659496, -5.659496, -5.659496, -5.659496, -5.659496, -5.659496, 4.500000
-4.500000, 4.500000, 4.500000, 4.500000, 4.500000, 4.500000, 4.500000, 4.500000, 4.500000, 4.500000, 4.500000
+1.163100,1.163100,1.163100,1.163100,1.163100,1.163100,1.163100,1.163100,1.163100,1.163100,1.163100,1.163100, 1.163100, 1.163100, 1.163100, 1.163100
+1.163100, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100, -1.954957, -0.256405, -3.418864, -0.773442, 8.512442
+7.784063, 8.253547, 7.254480, 7.069832, 7.144431, 8.562514, 7.076263, 7.505039, 9.015598, 8.961856, 8.336373, 7.193614, 7.519420, 10.263002, 7.165382, 7.734348
+14.009876, 10.195669, 7.825444, 10.455799, 7.164171, 9.749017, 7.476844, 9.082170, 7.258415, 10.255808, 10.500547, 10.392058, 10.550463, 10.311181, 10.124577, 6.221058
+5.917283, 6.395794, 5.963592, 6.065045, 5.420827, 6.133667, 6.363579, 5.550432, 5.595521, 1.163100, 5.059131, 5.980277, 6.824582, 3.795484, 7.027174, 3.263574
+3.227089, 5.071528, 3.137604, 3.821222, 4.588729, 4.767553, 4.339470, 5.118477, 5.030997, 5.011865, -8.476107, 5.209964, 4.993266, 6.327109, 6.116139, 7.039395
+9.991273, 5.927129, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100, 1.163100
ptzero2x2=
--7.273332,-7.273332,-7.273332,-7.273332,-7.273332,-7.273332,-7.273332,-7.273332,-7.273332,-7.273332,-7.273332,-7.273332, -7.273332, -7.273332, -7.273332, -9.445457
--9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -9.445457, -5.744131
--5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -5.744131, -3.248881
--3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -3.248881, -0.246144
--0.246144, -0.246144, -0.246144, -0.246144, -0.246144, -0.246144, -0.246144, -0.246144, -0.246144, -0.246144, -0.246144, -0.246144, -0.246144, -0.246144, -0.246144
+3.025090,-1.217016,2.657324,2.456548,3.525889,0.949490,1.937917,2.789236,2.810251,3.072301,4.153225,1.105237, 4.431941, 1.974898, 4.247875, 0.435342
+0.454753, 0.506482, 0.816860, 0.112388, 0.417007, -2.640680, 0.844155, 0.542893, 0.680219, -0.848558, 0.862602, 0.763201, 1.423722, 1.005851, 0.605578, 3.343871
+3.152511, 1.543816, 4.627370, 3.163723, 3.156759, 1.939422, 3.224666, 1.987696, 3.164969, 3.310650, 1.258043, 4.475357, 3.281488, 3.231974, 5.474241, 6.640255
+7.302666, 6.874259, 7.080468, 7.078150, 6.955405, 6.521795, 6.656303, 6.590717, 6.772610, 6.836106, 6.629103, 6.897783, 6.450650, 6.790705, 6.808803, 7.225401
+10.803930, 7.211506, 7.554112, 10.319892, 10.298988, 10.002675, 9.982267, 10.282555, 9.801709, 7.286862, 10.087855, 10.285944, 7.836669, 9.001265, 7.401463
ptzero2x1=
--3.606999,-3.606999,-3.606999,-3.606999,-3.606999,-3.606999,-3.606999,-3.606999,-3.606999,-3.606999,-3.606999,-3.606999, -3.606999, -3.606999, -3.606999, -3.606999
--6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022, -6.545022
--9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949, -9.501949
--8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296, -8.720296
-0.094710, 0.094710, 0.094710, 0.094710, 0.094710, 0.094710, 0.094710, 0.094710, 0.094710, 0.094710, 0.094710, 0.094710, 0.094710, 0.094710, 0.094710
+4.689897,5.742842,5.267213,5.428004,5.625134,4.206559,5.145965,6.411816,5.696975,3.768350,6.172361,6.013722, 6.013079, 6.382740, 6.854457, 6.085697
+3.279628, 3.575269, 3.027177, 3.448449, 1.292578, 1.330244, 3.105592, 1.922664, 1.986849, 3.354146, 1.573316, 1.332681, 3.513141, 4.649700, 5.622916, 4.608882
+1.380704, 0.893900, 0.985730, 0.800780, 1.001442, 0.937085, 0.981552, 0.703937, 0.339721, 0.793804, 0.814401, -0.579464, 0.781911, 0.696161, 0.877639, 0.825471
+0.907651, 1.084284, 2.560563, 1.181174, 1.177173, 1.129075, 0.972010, 1.023680, 0.938074, 0.916845, 1.209521, 0.794942, 0.960668, 1.051760, 1.068924, 1.049993
+9.177330, 11.170944, 10.605972, 10.653669, 10.718183, 9.374787, 10.774199, 10.781846, 10.617295, 10.819551, 9.012250, 10.838354, 10.568873, 10.553140, 10.616426
ptzero2u2=
-60.500000,60.500000,60.500000,60.500000,60.500000,60.500000,60.500000,60.500000,60.500000,60.500000,60.500000,60.500000, -3.343980, -3.343980, -3.343980, -3.343980
--3.343980, -3.343980, -3.343980, -3.343980, -3.343980, -3.343980, -3.343980, -3.343980, -3.343980, -3.343980, -3.343980, -3.343980, -2.488392, -2.488392, -2.488392, -2.488392
--2.488392, -2.488392, -2.488392, -2.488392, -2.488392, -2.488392, -2.488392, -2.488392, -2.488392, -2.488392, -2.488392, -2.488392, -9.962876, -9.962876, -9.962876, -9.962876
--9.962876, -9.962876, -9.962876, -9.962876, -9.962876, -9.962876, -9.962876, -9.962876, -9.962876, -9.962876, -9.962876, -9.962876, -8.176065, -8.176065, -8.176065, -8.176065
--8.176065, -8.176065, -8.176065, -8.176065, -8.176065, -8.176065, -8.176065, -8.176065, -8.176065, -8.176065, -8.176065, -8.176065, -8.992775, -8.992775, -8.992775, -8.992775
--8.992775, -8.992775, -8.992775, -8.992775, -8.992775, -8.992775, -8.992775, -8.992775, -8.992775, -8.992775, -8.992775, -8.992775, -3.760503, -3.760503, -3.760503, -3.760503
--3.760503, -3.760503, -3.760503, -3.760503, -3.760503, -3.760503, -3.760503, -3.760503, -3.760503, -3.760503, -3.760503
+1.270292,1.270292,1.270292,1.270292,1.270292,1.270292,1.270292,1.270292,1.270292,1.270292,1.270292,1.270292, 1.270292, 1.270292, 1.270292, 1.270292
+1.270292, 1.270292, 5.424004, 9.030725, 7.196095, 6.936860, 6.759001, 5.000175, 7.620346, 7.180556, 4.309788, 6.986512, 9.561963, 8.515167, 8.543623, 14.923480
+7.510010, 6.972898, 8.337814, 7.032208, 7.373982, 7.055179, 7.313428, 8.573670, 8.167227, 7.170683, 7.075148, 7.518450, 0.968800, 1.222250, 1.116116, 1.045431
+0.963026, 0.926795, 0.949844, 0.808244, 0.954463, 0.707071, 0.799908, 0.861795, 0.767199, 0.612592, 0.607371, 0.529870, 1.156938, 1.876723, 1.399161, 1.146195
+2.054729, 1.128603, 2.710242, 1.356659, 1.060793, 2.702970, 0.970834, 1.174632, 1.009900, 1.120875, 1.562876, 1.379444, 1.629620, 2.937618, 2.118394, 2.904804
+1.127059, 1.112664, 1.232318, 1.077389, 1.227431, 1.038764, 0.721151, 1.029128, 1.017306, 0.950461, 0.704183, 0.606513, 9.860039, 10.790346, 9.805850, 8.603539
+5.109025, 7.041357, -14.419476, 8.547312, 1.270292, 1.270292, 1.270292, 1.270292, 1.270292, 1.270292, 1.270292
ptzero2u1=
-22.500000,22.500000,22.500000,22.500000,22.500000,22.500000,22.500000,22.500000,22.500000,22.500000,22.500000,22.500000, 22.500000, 22.500000, 22.500000, -8.305755
--8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -8.305755, -0.833354
--0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.833354, -0.108779
--0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -0.108779, -8.225738
--8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.225738, -8.555231
--8.555231, -8.555231, -8.555231, -8.555231, -8.555231, -8.555231, -8.555231, -8.555231, -8.555231, -8.555231, -8.555231, -8.555231, -8.555231, -8.555231, -8.555231, 0.500000
-0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000, 0.500000
+1.316513,1.316513,1.316513,1.316513,1.316513,1.316513,1.316513,1.316513,1.316513,1.316513,1.316513,1.316513, 1.316513, 1.316513, 1.316513, 1.316513
+1.316513, 1.316513, 1.316513, -7.837922, 1.281529, -2.701879, -1.020420, 0.964685, 2.958407, 4.483214, 0.415477, 4.491651, 3.707600, 4.358634, 4.479964, 8.810177
+6.316620, 7.523221, 7.803749, 9.001413, 6.917912, 9.032829, 8.766214, 7.197881, 9.030009, 8.892036, 7.240794, 7.250931, 7.806886, 10.121682, 7.459729, 9.171595
+7.187347, 8.990869, 9.988273, 10.396889, 10.108062, 9.947135, 9.489432, 10.360765, 10.654640, 10.086538, 10.479711, 10.352656, 10.550052, 10.609856, 10.239722, 2.236651
+1.346771, 1.102798, 2.661735, 1.139854, 1.119713, 1.431661, 1.096613, 1.097908, 1.102846, 2.987942, 2.872611, 3.092576, 1.535272, 2.371921, 3.711759, 0.469255
+0.979078, 0.834339, 1.049123, 1.908209, 0.889663, 0.568060, 0.900010, 1.949845, 0.800841, 1.176438, 0.206111, 2.004865, 0.943304, 2.496328, 1.773690, 10.566739
+10.490980, 6.915175, 2.638551, 10.332053, 1.316513, 1.316513, 1.316513, 1.316513, 1.316513, 1.316513, 1.316513
diff --git a/PARAM/SHMS/GEN/p_fadc_debug.param b/PARAM/SHMS/GEN/p_fadc_debug.param
index 6fa113da69da76307321159a6ce4bc0e7bfca9a5..6e96ae4d9db6ddfbe1a8755de4305d88c07de64a 100644
--- a/PARAM/SHMS/GEN/p_fadc_debug.param
+++ b/PARAM/SHMS/GEN/p_fadc_debug.param
@@ -1,5 +1,5 @@
-phgcer_debug_adc = 0
-pngcer_debug_adc = 0
-paero_debug_adc = 0
-pcal_debug_adc = 0
-phodo_debug_adc = 0
+phgcer_debug_adc = 1
+pngcer_debug_adc = 1
+paero_debug_adc = 1
+pcal_debug_adc = 1
+phodo_debug_adc = 1
diff --git a/PARAM/SHMS/GEN/p_reftime_cut.param b/PARAM/SHMS/GEN/p_reftime_cut.param
index cade182931eb43b569d50684be2e75494b639368..185faf84a1fecf90c00b4cffc948b54ea927e835 100644
--- a/PARAM/SHMS/GEN/p_reftime_cut.param
+++ b/PARAM/SHMS/GEN/p_reftime_cut.param
@@ -7,12 +7,27 @@
; is used as reftime. If no ref time is found greater than the abs(refcut) then no
; reference time is used and warning message is produced.
; Cut is on reference time per detector.
-pdc_tdcrefcut=-14000.
-phodo_tdcrefcut=-3000.
-phodo_adcrefcut=-200./.0625
-pngcer_adcrefcut=-200./.0625
-phgcer_adcrefcut=-200./.0625
-paero_adcrefcut=-200./.0625
-pcal_adcrefcut=-200./.0625
+
+; from run 4698
+
+;pdc_tdcrefcut=-13000.
+;phodo_tdcrefcut=-3000.
+
+;phodo_adcrefcut=-200./.0625
+;pngcer_adcrefcut=-200./.0625
+;phgcer_adcrefcut=-200./.0625
+;paero_adcrefcut=-200./.0625
+;pcal_adcrefcut=-200./.0625
+
+; from run 4716
+
+pdc_tdcrefcut=-14500.
+phodo_tdcrefcut=-4000.
+
+phodo_adcrefcut=-5000.
+pngcer_adcrefcut=-5000.
+phgcer_adcrefcut=-5000.
+paero_adcrefcut=-5000.
+pcal_adcrefcut=-5000.
diff --git a/PARAM/SHMS/HGCER/phgcer_calib.param b/PARAM/SHMS/HGCER/phgcer_calib.param
index 46a2d429609c06cbf5727409cb3515d4f3f94335..b81e7e4182cc22399333176d9438243353414968 100644
--- a/PARAM/SHMS/HGCER/phgcer_calib.param
+++ b/PARAM/SHMS/HGCER/phgcer_calib.param
@@ -1,2 +1,6 @@
; Garth H. gain calibration from Run 1583, Dec 14 2017
-phgcer_adc_to_npe = 1.0/6.587, 1.0/7.069, 1.0/6.507, 1.0/6.367
+;phgcer_adc_to_npe = 1.0/6.587, 1.0/7.069, 1.0/6.507, 1.0/6.367
+;phgcer_adc_to_npe = 1.0/6.44, 1.0/7.05, 1.0/5.8, 1.0/6.83
+
+; Garth H. gain calibration from Run 4721, Sept 27 2018
+phgcer_adc_to_npe = 1.0/6.26, 1.0/7.30, 1.0/5.85, 1.0/6.98
diff --git a/PARAM/SHMS/HGCER/phgcer_cuts.param b/PARAM/SHMS/HGCER/phgcer_cuts.param
index 3251fb14013bc81e0f4f4ed20e84fa161af5179f..0050a95f8124bbe536144ac0e21289fe97e4603a 100644
--- a/PARAM/SHMS/HGCER/phgcer_cuts.param
+++ b/PARAM/SHMS/HGCER/phgcer_cuts.param
@@ -20,5 +20,7 @@ phgcer_npe_thresh = 0.5
# ADC time window cut values used to select "good" ADC events
phgcer_adc_tdc_offset = 200.0
-phgcer_adcTimeWindowMin = -1000.0, -1000.0, -1000.0, -1000.0
-phgcer_adcTimeWindowMax = 1000.0, 1000.0, 1000.0, 1000.0
\ No newline at end of file
+phgcer_adcTimeWindowMin = -40.0, -40.0, -40.0, -40.0
+phgcer_adcTimeWindowMax = 40.0, 40.0, 40.0, 40.0
+;phgcer_adcTimeWindowMin = 7.0, 5.0, 5.0, 5.0
+;phgcer_adcTimeWindowMax = 15.0, 13.0, 13.0, 13.0
\ No newline at end of file
diff --git a/PARAM/SHMS/HODO/phodo_TWcalib.param b/PARAM/SHMS/HODO/phodo_TWcalib.param
index 29ef1073d71d0feebf4f70112dd330a8264f2b06..bcb246411ae5ed5b753797b9fbccdbbc2e070ee9 100644
--- a/PARAM/SHMS/HODO/phodo_TWcalib.param
+++ b/PARAM/SHMS/HODO/phodo_TWcalib.param
@@ -4,96 +4,96 @@ pTDC_threshold=120 ;units of mV
;Param c1-Pos
; 1x 1y 2x 2y
-pc1_Pos = -3.92719, -2.89515, -3.70854, 1
- -3.432906, -3.474132, -3.468692, 1.000000
- -3.037982, 1.545130, -3.165317, 17.182499
- -4.117174, 0.207338, -3.062744, 16.589981
- -3.561862, -0.422333, -3.890974, 16.422799
- -2.808805, -0.631886, -4.106386, 15.853555
- -3.253879, 0.736456, -3.778283, 21.146852
- -2.475860, -4.026746, -0.315591, 20.441364
- -2.988727, -4.891862, 0.181872, 16.170665
- -2.818037, -3.973617, -3.726481, 16.730973
- -1.962244, -3.213717, -3.235611, 16.425070
- -2.711630, -4.165617, -3.135005, 17.673249
- -2.537710, -3.882753, -3.629122, 16.588156
- 0.000000, 0.000000, -3.219142, 16.790895
- 0.000000, 0.000000, 0.000000, 16.852403
- 0.000000, 0.000000, 0.000000, 17.192638
- 0.000000, 0.000000, 0.000000, 17.217057
- 0.000000, 0.000000, 0.000000, 16.396270
+pc1_Pos = 3.57566, 8.35022, 7.52461, 1
+ 4.070804, 7.776528, 7.911915, 1.000000
+ 8.126721, 8.726791, 8.124411, 28.324642
+ 7.447547, 7.362575, 4.437098, 27.760035
+ 7.825932, 6.675217, 7.438757, 27.667870
+ 8.002572, 6.662581, 7.211462, 27.133966
+ 7.990554, 8.055925, 7.517780, 28.287016
+ 4.967094, 7.339876, 6.885301, 27.661744
+ 7.724499, 6.514740, 7.488621, 27.386803
+ 7.811472, 3.289074, 7.607262, 27.887035
+ 8.449792, 4.174837, 8.008824, 27.639251
+ 7.925422, 7.005733, 8.162808, 24.947306
+ 7.841916, 7.194789, 3.668341, 27.897118
+ 0.000000, 0.000000, 4.083231, 28.107879
+ 0.000000, 0.000000, 0.000000, 28.121734
+ 0.000000, 0.000000, 0.000000, 28.342154
+ 0.000000, 0.000000, 0.000000, 28.191324
+ 0.000000, 0.000000, 0.000000, 27.629924
0.000000, 0.000000, 0.000000, 1.000000
0.000000, 0.000000, 0.000000, 1.000000
0.000000, 0.000000, 0.000000, 1.000000
;Param c1-Neg
; 1x 1y 2x 2y
-pc1_Neg = -11.135567, -3.229713, -10.900663, 1.000000
- -10.411872, 0.776436, -10.421928, 1.000000
- -10.023473, 1.014074, -10.541160, 7.130632
- -9.885641, -2.898302, -10.389358, 6.677418
- -10.324086, -3.460908, -10.859523, 6.613339
- -10.282738, -4.300508, -10.199066, 6.093739
- -10.036981, -2.691017, -10.184490, 6.860530
- -10.373097, -3.265396, -10.674967, 6.952260
- -10.077294, -3.065714, -10.508269, 6.002908
- -9.594024, -3.470350, -6.432588, 6.104233
- -9.154885, -3.236715, -9.966699, 9.336077
- -10.114559, -3.684497, -10.201280, 9.700994
- -9.990157, -3.613458, -10.613121, 9.562459
- 0.000000, 0.000000, -10.054941, 9.364906
- 0.000000, 0.000000, 0.000000, 5.981949
- 0.000000, 0.000000, 0.000000, 6.292996
- 0.000000, 0.000000, 0.000000, 6.541257
- 0.000000, 0.000000, 0.000000, 5.378402
+pc1_Neg = 0.236301, 8.644899, 0.520608, 1.000000
+ 0.978570, 8.637856, 0.985288, 1.000000
+ 1.108443, 8.954353, 0.506751, 18.755666
+ -2.500014, 8.507623, 1.055805, 18.170067
+ 1.111178, 8.503873, 0.403720, 18.155365
+ 1.029111, 7.452314, 1.174670, 17.658248
+ 1.476259, 9.220461, 1.206766, 18.325968
+ 0.948764, 8.162163, 0.626717, 18.477555
+ 1.353713, 8.386353, 0.920643, 17.489452
+ 1.716639, 7.810976, 1.006929, 17.588793
+ -1.853001, 8.167291, 1.377151, 16.882686
+ 1.591699, 7.653789, 1.233975, 17.226431
+ 1.418646, 7.562835, 0.754290, 17.230457
+ 0.000000, 0.000000, 1.239964, 17.024809
+ 0.000000, 0.000000, 0.000000, 17.687396
+ 0.000000, 0.000000, 0.000000, 17.843997
+ 0.000000, 0.000000, 0.000000, 13.921323
+ 0.000000, 0.000000, 0.000000, 17.005432
0.000000, 0.000000, 0.000000, 1.000000
0.000000, 0.000000, 0.000000, 1.000000
0.000000, 0.000000, 0.000000, 1.000000
;Param c2-Pos
; 1x 1y 2x 2y
-pc2_Pos = 1.018045, 0.755851, 0.773088, 1.000000
- 0.909794, 0.819894, 0.723479, 1.000000
- 0.867743, 0.760852, 0.847211, 0.808188
- 0.924981, 0.770527, 0.770209, 0.773229
- 0.749194, 0.732302, 0.858527, 0.814283
- 0.983201, 0.744322, 0.774826, 0.830631
- 0.958073, 0.730614, 0.797716, 0.814695
- 0.863235, 0.736635, 0.762902, 0.821758
- 0.892059, 0.826477, 0.750541, 0.858109
- 0.940488, 0.814386, 0.780966, 0.779350
- 0.948008, 0.820954, 0.788374, 0.784445
- 0.975963, 0.791405, 0.830518, 0.792036
- 0.775078, 0.774930, 0.765027, 0.848762
- 0.000000, 0.000000, 0.901578, 0.771102
- 0.000000, 0.000000, 0.000000, 0.835566
- 0.000000, 0.000000, 0.000000, 0.836937
- 0.000000, 0.000000, 0.000000, 0.719868
- 0.000000, 0.000000, 0.000000, 0.764541
+pc2_Pos = 0.928604, 0.770453, 0.785703, 1.000000
+ 0.844610, 0.793963, 0.732556, 1.000000
+ 0.899157, 0.778800, 0.806368, 0.607718
+ 0.887043, 0.801099, 0.733311, 0.645775
+ 0.747559, 0.786924, 0.864138, 0.763647
+ 0.964474, 0.745129, 0.746891, 0.800526
+ 0.924295, 0.706528, 0.779722, 0.582003
+ 0.789525, 0.726934, 0.797480, 0.716057
+ 0.890379, 0.737470, 0.783955, 0.769683
+ 0.869873, 0.812265, 0.784128, 0.659717
+ 0.835604, 0.733763, 0.763794, 0.656234
+ 0.892355, 0.892389, 0.792247, 0.730414
+ 0.779398, 0.776327, 0.762793, 0.672889
+ 0.000000, 0.000000, 0.813211, 0.561945
+ 0.000000, 0.000000, 0.000000, 0.609581
+ 0.000000, 0.000000, 0.000000, 0.540225
+ 0.000000, 0.000000, 0.000000, 0.630316
+ 0.000000, 0.000000, 0.000000, 0.698675
0.000000, 0.000000, 0.000000, 1.000000
0.000000, 0.000000, 0.000000, 1.000000
0.000000, 0.000000, 0.000000, 1.000000
;Param c2-Neg
; 1x 1y 2x 2y
-pc2_Neg = 0.956534, 0.697500, 0.829899, 1.000000
- 0.873431, 0.760331, 0.763115, 1.000000
- 0.895614, 0.744085, 0.943705, 0.789672
- 0.928632, 0.772659, 0.800749, 0.861992
- 0.822328, 0.769196, 0.958333, 0.870730
- 0.904921, 0.782588, 0.778823, 0.880437
- 0.918168, 0.774606, 0.805023, 0.905730
- 0.935383, 0.776247, 0.798657, 0.886320
- 0.905982, 0.775408, 0.770039, 0.901376
- 0.895464, 0.762241, 0.772260, 0.845635
- 1.001267, 0.728663, 0.794103, 0.896056
- 0.942687, 0.841030, 0.792844, 0.845636
- 0.730859, 0.730721, 0.810381, 0.811623
- 0.000000, 0.000000, 0.886761, 0.807710
- 0.000000, 0.000000, 0.000000, 0.815641
- 0.000000, 0.000000, 0.000000, 0.748641
- 0.000000, 0.000000, 0.000000, 0.689717
- 0.000000, 0.000000, 0.000000, 0.816122
+pc2_Neg = 0.943345, 0.811854, 0.790826, 1.000000
+ 0.893484, 1.005739, 0.801650, 1.000000
+ 0.953151, 0.769599, 1.020618, 0.697225
+ 0.918509, 0.790723, 0.794520, 0.730561
+ 0.765845, 0.783077, 0.918036, 0.740028
+ 0.920788, 0.785890, 0.776389, 0.747466
+ 0.827668, 0.759618, 0.798018, 0.757602
+ 0.924137, 0.758353, 0.816533, 0.761117
+ 0.907912, 0.755257, 0.780609, 0.768252
+ 0.901759, 0.852522, 0.802441, 0.752559
+ 0.978259, 0.745819, 0.807204, 0.812092
+ 1.237246, 0.886477, 0.783327, 0.776544
+ 0.797491, 0.799744, 0.780853, 0.723497
+ 0.000000, 0.000000, 0.781805, 0.737035
+ 0.000000, 0.000000, 0.000000, 0.787107
+ 0.000000, 0.000000, 0.000000, 0.744804
+ 0.000000, 0.000000, 0.000000, 0.745328
+ 0.000000, 0.000000, 0.000000, 0.743831
0.000000, 0.000000, 0.000000, 1.000000
0.000000, 0.000000, 0.000000, 1.000000
0.000000, 0.000000, 0.000000, 1.000000
diff --git a/PARAM/SHMS/HODO/phodo_Vpcalib.param b/PARAM/SHMS/HODO/phodo_Vpcalib.param
index f532d01ce41305929e8d8f2b7bf6e07bf5756e89..eed0b64519c105e7b60d0e24dc57084dcc128b73 100644
--- a/PARAM/SHMS/HODO/phodo_Vpcalib.param
+++ b/PARAM/SHMS/HODO/phodo_Vpcalib.param
@@ -5,323 +5,125 @@
;Propagation Velocity Per Paddle
; 1x 1y 2x 2y
-phodo_velFit = 15, 15, 16.1716, 13.0
- 15.988372, 15.845788, 15.529640, 13.000000
- 15.496232, 15.148875, 15.828629, 13.920778
- 15.844549, 14.863712, 15.804882, 13.879603
- 15.301818, 14.865641, 16.487603, 13.632654
- 15.872771, 15.213208, 15.721738, 13.472794
- 15.471309, 15.041296, 15.503405, 13.548858
- 16.305855, 15.067037, 15.457968, 13.752641
- 15.552458, 15.278147, 15.728924, 13.658751
- 16.171688, 14.806411, 15.583351, 13.570617
- 15.889942, 15.247898, 15.885529, 13.721835
- 16.524203, 14.719731, 16.177121, 13.450784
- 15.000000, 15.000000, 17.710596, 13.755359
- 0.000000, 0.000000, 15.000000, 13.647046
- 0.000000, 0.000000, 0.000000, 13.478829
- 0.000000, 0.000000, 0.000000, 13.534854
- 0.000000, 0.000000, 0.000000, 13.678625
- 0.000000, 0.000000, 0.000000, 13.805170
- 0.000000, 0.000000, 0.000000, 13.805170
- 0.000000, 0.000000, 0.000000, 13.805170
- 0.000000, 0.000000, 0.000000, 13.805170
+phodo_velFit = 15.1152, 15.1576, 16.1774, 15
+ 16.847059, 15.144910, 15.479187, 15.000000
+ 15.682466, 15.417176, 16.260915, 15.225871
+ 17.015474, 14.732033, 15.519209, 16.363118
+ 16.108540, 14.879273, 16.628477, 15.002353
+ 17.051891, 15.078072, 15.803337, 15.620936
+ 16.646820, 14.964402, 16.419322, 15.765506
+ 16.288340, 14.609453, 17.575588, 14.165944
+ 16.446424, 14.841322, 17.957590, 13.810436
+ 17.169815, 14.993386, 16.864742, 13.567709
+ 17.521654, 15.256632, 15.770825, 13.470286
+ 17.039503, 15.514897, 15.526921, 13.326714
+ 15.253213, 15.560131, 15.418299, 13.363423
+ 0.000000, 0.000000, 21.941907, 13.541621
+ 0.000000, 0.000000, 0.000000, 13.422998
+ 0.000000, 0.000000, 0.000000, 14.930468
+ 0.000000, 0.000000, 0.000000, 13.205182
+ 0.000000, 0.000000, 0.000000, 16.037807
+ 0.000000, 0.000000, 0.000000, 15.000000
+ 0.000000, 0.000000, 0.000000, 15.000000
+ 0.000000, 0.000000, 0.000000, 15.000000
;PMTs Signal Cable Time Diff. Per Paddle
; 1x 1y 2x 2y
-phodo_cableFit = -3.95704,0.543158,-1.98723,0.0
--3.42421,0.853665,-1.54251,0.0
--3.47986,-0.416552,-1.86876,-1.45136
--2.90465,-0.100911,-2.12493,-0.996569
--4.03398,0.509892,-1.91145,-2.53343
--2.6302,1.19228,-2.39676,-1.63071
--2.50418,0.397654,-2.25048,-1.45577
--2.64388,-0.636166,-1.62484,-1.56385
--1.88663,0.297316,-3.39385,-1.97847
--1.65055,0.587191,-2.78811,-1.88735
--2.69994,-0.118966,-1.0501,-1.56805
--2.96139,-0.673289,-2.08349,-1.45915
--3.12759,-0.121197,-3.06317,-2.48535
-0.0,0.0,-1.9976,-1.49521
-0.0,0.0,0.0,-0.526178
-0.0,0.0,0.0,-2.86213
-0.0,0.0,0.0,-1.5158
-0.0,0.0,0.0,-1.44955
-0.0,0.0,0.0,0.0
-0.0,0.0,0.0,0.0
-0.0,0.0,0.0,0.0
-
- ;PMTs Signal Cable Time Diff. Per Paddle
-; 1x 1y 2x 2y
-phodo_cableFit = -3.357531, 1.545762, -3.020192, 1.000000
- -3.545240, 0.882946, -2.630806, 1.000000
- -3.550602, -0.358678, -2.912346, 1.000000
- -3.073059, -0.079664, -3.229881, -3.088573
- -4.151041, 0.535760, -2.923798, -4.815673
- -2.644154, 1.227497, -3.483335, -3.967115
- -2.577871, 0.405994, -3.320868, -3.762226
- -2.765498, -0.561669, -2.734090, -3.869096
- -1.950696, 0.351183, -4.508244, -4.232580
- -1.786344, 0.630290, -3.850383, -4.142896
- -1.945646, -0.069901, -2.149197, -3.899172
- -3.008011, -0.589894, -3.141905, -3.900085
- -3.008011, -0.589894, -4.194122, -4.942764
- 0.000000, 0.000000, -3.103867, -3.753152
- 0.000000, 0.000000, 0.000000, -2.886491
- 0.000000, 0.000000, 0.000000, -5.203327
- 0.000000, 0.000000, 0.000000, -3.651863
- 0.000000, 0.000000, 0.000000, -3.734302
- 0.000000, 0.000000, 0.000000, -3.734302
- 0.000000, 0.000000, 0.000000, -3.734302
- 0.000000, 0.000000, 0.000000, -3.734302
-
-
-
-
-;PMTs Time Diff. Sigma Parameters
-; 1x 1y 2x 2y
-phodo_PosSigma = 0.735795, 1.102072, 0.387326, 0.000000
- 0.168380, 0.166631, 0.263459, 0.000000
- 0.168040, 0.145316, 0.236013, 0.257091
- 0.172828, 0.147417, 0.262150, 0.228226
- 0.157397, 0.168453, 0.241331, 0.240773
- 0.154965, 0.141055, 0.264945, 0.212397
- 0.153516, 0.140168, 0.242682, 0.247301
- 0.177137, 0.147670, 0.287324, 0.236837
- 0.166676, 0.141468, 0.287426, 0.245311
- 0.165870, 0.175206, 0.262201, 0.230415
- 0.219854, 0.157102, 0.267886, 0.251823
- 0.216701, 0.163155, 0.293436, 0.247905
- 1.126373, 1.010673, 0.358898, 0.243213
- 0.000000, 0.000000, 0.768048, 0.243496
- 0.000000, 0.000000, 0.000000, 0.254073
- 0.000000, 0.000000, 0.000000, 0.275909
- 0.000000, 0.000000, 0.000000, 0.266002
- 0.000000, 0.000000, 0.000000, 0.227823
- 0.000000, 0.000000, 0.000000, 0.000000
- 0.000000, 0.000000, 0.000000, 0.000000
- 0.000000, 0.000000, 0.000000, 0.000000
-
-
-phodo_NegSigma = 0.735795, 1.102072, 0.387326, 0.000000
- 0.168380, 0.166631, 0.263459, 0.000000
- 0.168040, 0.145316, 0.236013, 0.257091
- 0.172828, 0.147417, 0.262150, 0.228226
- 0.157397, 0.168453, 0.241331, 0.240773
- 0.154965, 0.141055, 0.264945, 0.212397
- 0.153516, 0.140168, 0.242682, 0.247301
- 0.177137, 0.147670, 0.287324, 0.236837
- 0.166676, 0.141468, 0.287426, 0.245311
- 0.165870, 0.175206, 0.262201, 0.230415
- 0.219854, 0.157102, 0.267886, 0.251823
- 0.216701, 0.163155, 0.293436, 0.247905
- 1.126373, 1.010673, 0.358898, 0.243213
- 0.000000, 0.000000, 0.768048, 0.243496
- 0.000000, 0.000000, 0.000000, 0.254073
- 0.000000, 0.000000, 0.000000, 0.275909
- 0.000000, 0.000000, 0.000000, 0.266002
- 0.000000, 0.000000, 0.000000, 0.227823
+phodo_cableFit = -4.563156, -1.301132, -3.030677, 0.000000
+ -3.532632, 1.000988, -2.715600, 0.000000
+ -3.500585, -0.426416, -2.972426, -3.856907
+ -3.043733, -0.088109, -3.243193, -3.294050
+ -3.998279, 0.352135, -2.926417, -4.894415
+ -2.320673, 1.192133, -3.440253, -3.923082
+ -3.202423, 0.361598, -3.312400, -3.814443
+ -2.735900, -0.621461, -2.708283, -3.784622
+ -1.560126, 0.286374, -4.454302, -4.180796
+ -1.414376, 0.510450, -4.048892, -4.066930
+ -2.551914, -0.244547, -2.175707, -3.805853
+ -2.557762, -0.681217, -3.452330, -3.773111
+ -3.069494, 0.318697, -4.171783, -4.819088
+ 0.000000, 0.000000, -3.043381, -3.653102
+ 0.000000, 0.000000, 0.000000, -2.855196
+ 0.000000, 0.000000, 0.000000, -5.243996
+ 0.000000, 0.000000, 0.000000, -3.657807
+ 0.000000, 0.000000, 0.000000, -3.319572
0.000000, 0.000000, 0.000000, 0.000000
0.000000, 0.000000, 0.000000, 0.000000
0.000000, 0.000000, 0.000000, 0.000000
-
-
-
-;Timing Corrections Per Paddle, where 1X Paddle 7 has been set as the reference paddle
-; 1x 1y 2x 2y
-phodo_LCoeff = 0.000000, 7.000000, 2.000000, 0.000000
- 0.000000, 7.000000, 2.000000, 0.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 7.000000, 2.000000, -6.000000
- 0.000000, 0.000000, 2.000000, -6.000000
- 0.000000, 0.000000, 0.000000, -6.000000
- 0.000000, 0.000000, 0.000000, -6.000000
- 0.000000, 0.000000, 0.000000, -6.000000
- 0.000000, 0.000000, 0.000000, -6.000000
- 0.000000, 0.000000, 0.000000, 0.000000
- 0.000000, 0.000000, 0.000000, 0.000000
- 0.000000, 0.000000, 0.000000, 0.000000
-;Propagation Velocity Per Paddle
-; 1x 1y 2x 2y
-phodo_velFit = 15, 15, 15.954, 15
- 17.310670, 15.938144, 15.501041, 15.000000
- 15.464943, 15.533982, 16.226578, 15.000000
- 17.167112, 15.047815, 16.034219, 16.390537
- 16.533792, 14.705335, 17.133488, 16.349269
- 16.169260, 15.122754, 15.898695, 15.850737
- 16.039126, 15.018621, 15.892273, 15.107258
- 18.407871, 14.908702, 16.089882, 15.831129
- 15.232766, 15.178403, 15.884689, 15.309612
- 17.533239, 14.863093, 15.826589, 15.562260
- 15.000000, 15.302005, 16.589734, 15.745679
- 17.940160, 14.941686, 15.928434, 15.595167
- 17.940160, 14.941686, 16.323469, 15.137030
- 0.000000, 0.000000, 17.325250, 15.683227
- 0.000000, 0.000000, 0.000000, 16.211867
- 0.000000, 0.000000, 0.000000, 16.635247
- 0.000000, 0.000000, 0.000000, 16.556523
- 0.000000, 0.000000, 0.000000, 15.645527
- 0.000000, 0.000000, 0.000000, 15.645527
- 0.000000, 0.000000, 0.000000, 15.645527
- 0.000000, 0.000000, 0.000000, 15.645527
-;PMTs Signal Cable Time Diff. Per Paddle
-; 1x 1y 2x 2y
-phodo_cableFit = -3.357183, 1.625532, -3.015746, 1.000000
- -3.542724, 0.885494, -2.633430, 1.000000
- -3.556181, -0.356099, -2.915295, 1.000000
- -3.066295, -0.081810, -3.228158, -3.090462
- -4.149617, 0.536880, -2.921378, -4.812941
- -2.643801, 1.219147, -3.483029, -3.968747
- -2.577742, 0.404662, -3.323944, -3.757586
- -2.765750, -0.562129, -2.731061, -3.869146
- -1.952338, 0.353366, -4.503935, -4.230388
- -1.788155, 0.631075, -3.844993, -4.139326
- -1.961666, -0.073502, -2.147454, -3.890481
- -3.010442, -0.592166, -3.144223, -3.892659
- -3.010442, -0.592166, -4.179461, -4.940576
- 0.000000, 0.000000, -3.091147, -3.752871
- 0.000000, 0.000000, 0.000000, -2.891862
- 0.000000, 0.000000, 0.000000, -5.176546
- 0.000000, 0.000000, 0.000000, -3.651118
- 0.000000, 0.000000, 0.000000, -3.745483
- 0.000000, 0.000000, 0.000000, -3.745483
- 0.000000, 0.000000, 0.000000, -3.745483
- 0.000000, 0.000000, 0.000000, -3.745483
-
- ;Timing Corrections Per Paddle, where 1X Paddle 7 has been set as the reference paddle
-; 1x 1y 2x 2y
-phodo_LCoeff = 0.000000, -0.000000, 0.694774, 0.000000
- -0.485827, 7.380302, 1.730668, 0.000000
- -1.816111, 5.917822, 0.506329, -4.066023
- -1.317521, 6.147203, 1.230043, -6.567193
- -0.783746, 7.479410, 0.697103, -9.330637
- -0.394518, 8.452493, 1.793627, -9.808756
- 0.000000, 6.344737, 0.706598, -8.534273
- 0.996121, 5.909889, 1.351521, -7.524326
- 1.536053, 7.032192, 0.412883, -8.676890
- 1.805332, 7.803246, 1.058359, -7.129796
- 1.018789, 7.114504, 2.142647, -7.667216
- -0.398446, 6.177379, -0.161907, -7.913443
- -0.000000, -0.000000, -1.283699, -8.812687
- 0.000000, 0.000000, 1.151999, -8.476286
- 0.000000, 0.000000, 0.000000, -7.756490
- 0.000000, 0.000000, 0.000000, -10.596327
- 0.000000, 0.000000, 0.000000, -8.937207
- 0.000000, 0.000000, 0.000000, -6.654796
- 0.000000, 0.000000, 0.000000, 0.000000
- 0.000000, 0.000000, 0.000000, 0.000000
- 0.000000, 0.000000, 0.000000, 0.000000
-;Timing Corrections Per Paddle, where 1X Paddle 7 has been set as the reference paddle
+;PMTs Time Diff. Sigma Parameters
; 1x 1y 2x 2y
-phodo_LCoeff = 0.000000, -0.000000, 0.688952, 0.000000
- -0.492324, 7.369221, 1.721302, 0.000000
- -1.831555, 5.918468, 0.494383, -4.072605
- -1.319619, 6.135908, 1.222853, -6.574729
- -0.791124, 7.470160, 0.691154, -9.335774
- -0.404817, 8.436518, 1.783400, -9.826532
- -0.000000, 6.333016, 0.695287, -8.535910
- 0.988295, 5.902220, 1.345598, -7.526918
- 1.522884, 7.025064, 0.410201, -8.689376
- 1.795131, 7.792195, 1.048950, -7.140668
- 0.999777, 7.108389, 2.137711, -7.662394
- -0.405030, 6.171202, -0.167997, -7.922597
- 0.000000, 0.000000, -1.265008, -8.818811
- 0.000000, 0.000000, 1.158575, -8.480837
- 0.000000, 0.000000, 0.000000, -7.763864
- 0.000000, 0.000000, 0.000000, -10.593897
- 0.000000, 0.000000, 0.000000, -8.940670
- 0.000000, 0.000000, 0.000000, -6.684843
- 0.000000, 0.000000, 0.000000, 0.000000
- 0.000000, 0.000000, 0.000000, 0.000000
- 0.000000, 0.000000, 0.000000, 0.000000
- 0.000000, 0.000000, 0.000000, 0.000000
+phodo_PosSigma = 0.150929, -0.173025, 0.390280, 1.000000
+ 0.161730, 0.266437, 0.248352, 1.000000
+ 0.159576, 0.160180, 0.228076, 0.314694
+ 0.176775, 0.156867, 0.272274, 0.249535
+ 0.162237, 0.171669, 0.228728, 0.306648
+ 0.134067, 0.147333, 0.265452, 0.276119
+ 0.160592, 0.143154, 0.256513, 0.259824
+ 0.181905, 0.157961, 0.263633, 0.289181
+ 0.150480, 0.158520, 0.229729, 0.273321
+ 0.163214, 0.155165, 0.193650, 0.281120
+ 0.160442, 0.218460, 0.238966, 0.237621
+ 0.202651, 0.492581, 0.239886, 0.247701
+ -0.073327, -0.069703, 0.226823, 0.282189
+ 0.000000, 0.000000, 0.519548, 0.327512
+ 0.000000, 0.000000, 0.000000, 0.459026
+ 0.000000, 0.000000, 0.000000, 0.430407
+ 0.000000, 0.000000, 0.000000, 0.348406
+ 0.000000, 0.000000, 0.000000, 0.314538
+ 0.000000, 0.000000, 0.000000, 1.000000
+ 0.000000, 0.000000, 0.000000, 1.000000
+ 0.000000, 0.000000, 0.000000, 1.000000
+
+
+phodo_NegSigma = 0.150929, -0.173025, 0.390280, 1.000000
+ 0.161730, 0.266437, 0.248352, 1.000000
+ 0.159576, 0.160180, 0.228076, 0.314694
+ 0.176775, 0.156867, 0.272274, 0.249535
+ 0.162237, 0.171669, 0.228728, 0.306648
+ 0.134067, 0.147333, 0.265452, 0.276119
+ 0.160592, 0.143154, 0.256513, 0.259824
+ 0.181905, 0.157961, 0.263633, 0.289181
+ 0.150480, 0.158520, 0.229729, 0.273321
+ 0.163214, 0.155165, 0.193650, 0.281120
+ 0.160442, 0.218460, 0.238966, 0.237621
+ 0.202651, 0.492581, 0.239886, 0.247701
+ -0.073327, -0.069703, 0.226823, 0.282189
+ 0.000000, 0.000000, 0.519548, 0.327512
+ 0.000000, 0.000000, 0.000000, 0.459026
+ 0.000000, 0.000000, 0.000000, 0.430407
+ 0.000000, 0.000000, 0.000000, 0.348406
+ 0.000000, 0.000000, 0.000000, 0.314538
+ 0.000000, 0.000000, 0.000000, 1.000000
+ 0.000000, 0.000000, 0.000000, 1.000000
+ 0.000000, 0.000000, 0.000000, 1.000000
-;Propagation Velocity Per Paddle
-; 1x 1y 2x 2y
-phodo_velFit = 15, 15, 15.9381, 15
- 17.260424, 15.868145, 15.503457, 15.000000
- 15.600119, 16.419880, 16.204985, 15.000000
- 17.162626, 15.131935, 16.010936, 16.381108
- 16.475943, 14.702341, 17.161005, 16.561313
- 16.167555, 15.196136, 15.975905, 15.889592
- 16.025176, 15.019695, 15.879271, 14.969649
- 18.416052, 14.906276, 16.093701, 15.610552
- 15.123981, 15.098157, 15.847010, 15.337559
- 17.545176, 14.862248, 15.781898, 15.533833
- 15.000000, 15.337287, 16.588659, 15.764042
- 17.964072, 14.962037, 16.110037, 15.687259
- 17.964072, 14.962037, 16.110037, 15.120855
- 0.000000, 0.000000, 16.110037, 15.642673
- 0.000000, 0.000000, 0.000000, 16.453989
- 0.000000, 0.000000, 0.000000, 16.571537
- 0.000000, 0.000000, 0.000000, 16.099210
- 0.000000, 0.000000, 0.000000, 16.753512
- 0.000000, 0.000000, 0.000000, 16.753512
- 0.000000, 0.000000, 0.000000, 16.753512
- 0.000000, 0.000000, 0.000000, 16.753512
-
-
-
-;PMTs Signal Cable Time Diff. Per Paddle
-; 1x 1y 2x 2y
-phodo_cableFit = -3.357183, 1.000000, -3.015579, 1.000000
- -3.537278, 0.887489, -2.634722, 1.000000
- -3.565583, -0.244284, -2.916951, 1.000000
- -3.067127, -0.072824, -3.228442, -3.090285
- -4.154775, 0.537040, -2.923693, -4.767679
- -2.644439, 1.222025, -3.473746, -3.929138
- -2.576887, 0.404651, -3.325903, -3.728782
- -2.766104, -0.561178, -2.731142, -3.853402
- -1.954081, 0.355053, -4.500733, -4.207428
- -1.787599, 0.633525, -3.841666, -4.137807
- -2.007133, -0.074697, -2.148214, -3.888825
- -3.009647, -0.590701, -3.138533, -3.895588
- -3.009647, -0.590701, -3.138533, -4.940536
- 0.000000, 0.000000, -3.138533, -3.753430
- 0.000000, 0.000000, 0.000000, -2.895581
- 0.000000, 0.000000, 0.000000, -5.179619
- 0.000000, 0.000000, 0.000000, -3.665550
- 0.000000, 0.000000, 0.000000, -3.688521
- 0.000000, 0.000000, 0.000000, -3.688521
- 0.000000, 0.000000, 0.000000, -3.688521
- 0.000000, 0.000000, 0.000000, -3.688521
-
- ;Timing Corrections Per Paddle, where 1X Paddle 7 has been set as the reference paddle
+
+;Timing Corrections Per Paddle, where 1X Paddle 7 has been set as the reference paddle
; 1x 1y 2x 2y
-phodo_LCoeff = 0.000000, 0.000000, 0.689560, 0.000000
- -0.486245, 7.374751, 1.719129, 0.000000
- -1.841975, 6.030215, 0.492691, -4.075245
- -1.321451, 6.144090, 1.221723, -6.576862
- -0.797234, 7.470091, 0.688394, -9.293558
- -0.404298, 8.438895, 1.795289, -9.787223
- 0.000000, 6.334349, 0.691879, -8.510553
- 0.988795, 5.902782, 1.344861, -7.510537
- 1.521991, 7.026380, 0.411981, -8.668207
- 1.796842, 7.794578, 1.050164, -7.140068
- 0.954445, 7.106304, 2.139753, -7.659395
- -0.402322, 6.175723, -0.161946, -7.923818
- -0.000000, 0.000000, -0.222783, -8.816089
- 0.000000, 0.000000, 1.107272, -8.479618
- 0.000000, 0.000000, 0.000000, -7.770594
- 0.000000, 0.000000, 0.000000, -10.595961
- 0.000000, 0.000000, 0.000000, -8.958737
- 0.000000, 0.000000, 0.000000, -6.625524
+phodo_LCoeff = 0.000000, -0.000000, 0.741477, 0.000000
+ -0.506214, 7.480331, 1.642828, 0.000000
+ -1.654576, 5.768478, 0.344954, -9.166426
+ -1.287221, 6.150950, 1.116185, -7.086786
+ -0.712361, 7.114043, 0.513053, -9.601254
+ 0.218923, 8.383619, 1.701960, -10.067294
+ -0.000000, 6.238177, 0.561293, -8.853878
+ 0.806394, 5.815630, 1.289329, -7.715299
+ 2.178217, 6.854963, 0.367755, -8.808863
+ 2.439687, 7.652230, 0.567753, -7.224764
+ 0.735035, 6.756861, 2.055375, -7.621469
+ 0.042548, 6.082597, -0.808125, -7.853610
+ -0.000000, 0.000000, -1.180419, -8.841523
+ 0.000000, 0.000000, 0.941469, -8.512802
+ 0.000000, 0.000000, 0.000000, -7.867930
+ 0.000000, 0.000000, 0.000000, -10.722687
+ 0.000000, 0.000000, 0.000000, -8.999177
+ 0.000000, 0.000000, 0.000000, -6.460877
0.000000, 0.000000, 0.000000, 0.000000
0.000000, 0.000000, 0.000000, 0.000000
0.000000, 0.000000, 0.000000, 0.000000
-
diff --git a/PARAM/SHMS/HODO/phodo_cuts.param b/PARAM/SHMS/HODO/phodo_cuts.param
index 6db5cd45ee006a17bd4a99069267decf89b08d55..1ac1bb15a37aaf0da7ab9f12257b87e30435c71c 100644
--- a/PARAM/SHMS/HODO/phodo_cuts.param
+++ b/PARAM/SHMS/HODO/phodo_cuts.param
@@ -18,10 +18,16 @@ pstart_time_center = 32.
pstart_time_slop = 100.
; pscin_tdc_min minimum tdc value in hms scin
-pscin_tdc_min = -500
+;pscin_tdc_min = -500
+
+;with run 4698
+pscin_tdc_min = -1000
; pscin_tdc_max maximum allowed tdc value
-pscin_tdc_max = 1000
+;pscin_tdc_max = -1000
+
+; with run 4698
+pscin_tdc_max = 2000
; pscin_tdc_to_time scin tdc time per channel
pscin_tdc_to_time = 0.09766 ; 0.1 (See Log Entry 3574348)
@@ -44,92 +50,92 @@ phodo_tdc_offset = 2000, 2000, 2000, 2000
; to move the ADC pulse time after reference time subtraction to a reasonable time (ns).
phodo_adc_tdc_offset = 200., 200., 200., 200.
-phodo_PosAdcTimeWindowMin = -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.
-
-phodo_PosAdcTimeWindowMax = 200., 200., 200., 200.
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.
-
-phodo_NegAdcTimeWindowMax = 200., 200., 200., 200.
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.,
- 200., 200., 200., 200.
-
-phodo_NegAdcTimeWindowMin = -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.,
- -200., -200., -200., -200.
+phodo_PosAdcTimeWindowMin = -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.,
+ -32., -32., -32., -10.
+
+phodo_PosAdcTimeWindowMax = 32., 34., 33., 53.
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.,
+ 32., 34., 33., 53.
+
+phodo_NegAdcTimeWindowMax = 29., 33., 26., 43.
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.,
+ 29., 33., 26., 43.
+
+phodo_NegAdcTimeWindowMin = -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.,
+ -35., -29., -36., -20.
diff --git a/SCRIPTS/COIN/SCALERS/replay_coin_scalers.C b/SCRIPTS/COIN/SCALERS/replay_coin_scalers.C
index a3f28c324848d14bc4e85790269b5a0b1f283b8b..0e88065dc4ad94993df29427173e73118c63010b 100644
--- a/SCRIPTS/COIN/SCALERS/replay_coin_scalers.C
+++ b/SCRIPTS/COIN/SCALERS/replay_coin_scalers.C
@@ -1,4 +1,4 @@
-void replay_coin_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
+void replay_coin_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0,Int_t FirstEvent=1) {
// Get RunNumber and MaxEvent if not provided.
if(RunNumber == 0) {
@@ -116,7 +116,7 @@ void replay_coin_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Eventually need to learn to skip over, or properly analyze
// the pedestal events
- run->SetEventRange(1, MaxEvent); // Physics Event number, does not
+ run->SetEventRange(FirstEvent, MaxEvent); // Physics Event number, does not
// include scaler or control events.
run->SetNscan(1);
run->SetDataRequired(0x7);
@@ -128,6 +128,7 @@ void replay_coin_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// 1 = counter is # of all decode reads
// 2 = counter is event number
analyzer->SetEvent(event);
+ analyzer->SetMarkInterval(100000);
// Set EPICS event type
analyzer->SetEpicsEvtType(180);
// Define crate map
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin_all.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin_all.C
index 6940f45b50f548b327b9ac8560771aa492305802..2b0fd9e6919cb2fb3992cd178e59a088c8fdd172 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin_all.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin_all.C
@@ -28,7 +28,7 @@ void replay_production_hms_coin_all(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Load Global parameters
// Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/standard.database");
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/standard.database");
gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
@@ -40,14 +40,7 @@ void replay_production_hms_coin_all(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Load the Hall C detector map
gHcDetectorMap = new THcDetectorMap();
gHcDetectorMap->Load("MAPS/HMS/DETEC/STACK/hms_stack.map");
-
- // Add trigger apparatus
- THaApparatus* TRG = new THcTrigApp("T", "TRG");
- gHaApps->Add(TRG);
- // Add trigger detector to trigger apparatus
- THcTrigDet* hms = new THcTrigDet("hms", "HMS Trigger Information");
- TRG->AddDetector(hms);
-
+
// Set up the equipment to be analyzed.
THcHallCSpectrometer* HMS = new THcHallCSpectrometer("H", "HMS");
HMS->SetEvtType(2);
@@ -72,6 +65,14 @@ void replay_production_hms_coin_all(Int_t RunNumber=0, Int_t MaxEvent=0) {
THcShower* cal = new THcShower("cal", "Calorimeter");
HMS->AddDetector(cal);
+ // Add trigger apparatus
+ THaApparatus* TRG = new THcTrigApp("T", "TRG");
+ gHaApps->Add(TRG);
+ // Add trigger detector to trigger apparatus
+ THcTrigDet* hms = new THcTrigDet("hms", "HMS Trigger Information");
+ hms->SetSpectName("H");
+ TRG->AddDetector(hms);
+
// Add rastered beam apparatus
THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline");
gHaApps->Add(beam);
@@ -143,6 +144,7 @@ void replay_production_hms_coin_all(Int_t RunNumber=0, Int_t MaxEvent=0) {
analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
// 1 = counter is # of all decode reads
// 2 = counter is event number
+
analyzer->SetEvent(event);
// Set EPICS event type
analyzer->SetEpicsEvtType(182);
diff --git a/TEMPLATES/COIN/PRODUCTION/coin_production.template b/TEMPLATES/COIN/PRODUCTION/coin_production.template
index fcd0763dcfc7e06ea1dd65bcac3e43e34fd2d012..81ab52745bcb7cf42e094047d817b7c7da79c923 100644
--- a/TEMPLATES/COIN/PRODUCTION/coin_production.template
+++ b/TEMPLATES/COIN/PRODUCTION/coin_production.template
@@ -37,12 +37,12 @@ HMS BCM4C Charge: {H.BCM4C.scalerCharge/1000.:%.3f} mC
HMS Unser Charge: {H.Unser.scalerCharge/1000.:%.3f} mC
Cut on BCM{gBCM_Current_threshold_index+1} current of {gBCM_Current_threshold} uA. Beam over threshold for {H.1MHz.scalerTimeCut:%.3f}s, or {((H.1MHz.scalerTimeCut/H.1MHz.scalerTime)*100.):%.3f}% of total run time.
-HMS BCM1 Beam Cut Current: {H.BCM1.scalerCharge/H.1MHz.scalerTime:%.3f} uA
-HMS BCM2 Beam Cut Current: {H.BCM2.scalerCharge/H.1MHz.scalerTime:%.3f} uA
-HMS BCM4A Beam Cut Current: {H.BCM4A.scalerCharge/H.1MHz.scalerTime:%.3f} uA
-HMS BCM4B Beam Cut Current: {H.BCM4B.scalerCharge/H.1MHz.scalerTime:%.3f} uA
-HMS BCM4C Beam Cut Current: {H.BCM4C.scalerCharge/H.1MHz.scalerTime:%.3f} uA
-HMS Unser Beam Cut Current: {H.Unser.scalerCharge/H.1MHz.scalerTime:%.3f} uA
+HMS BCM1 Beam Cut Current: {H.BCM1.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
+HMS BCM2 Beam Cut Current: {H.BCM2.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
+HMS BCM4A Beam Cut Current: {H.BCM4A.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
+HMS BCM4B Beam Cut Current: {H.BCM4B.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
+HMS BCM4C Beam Cut Current: {H.BCM4C.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
+HMS Unser Beam Cut Current: {H.Unser.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
HMS BCM1 Beam Cut Charge: {H.BCM1.scalerChargeCut/1000. :%.3f} mC
HMS BCM2 Beam Cut Charge: {H.BCM2.scalerChargeCut/1000.:%.3f} mC
@@ -68,12 +68,12 @@ SHMS BCM4C Charge: {P.BCM4C.scalerCharge/1000.:%.3f} mC
SHMS Unser Charge: {P.Unser.scalerCharge/1000.:%.3f} mC
Cut on BCM{gBCM_Current_threshold_index+1} current of {gBCM_Current_threshold} uA. Beam over threshold for {P.1MHz.scalerTimeCut:%.3f}s, or {((P.1MHz.scalerTimeCut/P.1MHz.scalerTime)*100.):%.3f}% of total run time.
-SHMS BCM1 Beam Cut Current: {P.BCM1.scalerCharge/P.1MHz.scalerTime:%.3f} uA
-SHMS BCM2 Beam Cut Current: {P.BCM2.scalerCharge/P.1MHz.scalerTime:%.3f} uA
-SHMS BCM4A Beam Cut Current: {P.BCM4A.scalerCharge/P.1MHz.scalerTime:%.3f} uA
-SHMS BCM4B Beam Cut Current: {P.BCM4B.scalerCharge/P.1MHz.scalerTime:%.3f} uA
-SHMS BCM4C Beam Cut Current: {P.BCM4C.scalerCharge/P.1MHz.scalerTime:%.3f} uA
-SHMS Unser Beam Cut Current: {P.Unser.scalerCharge/P.1MHz.scalerTime:%.3f} uA
+SHMS BCM1 Beam Cut Current: {P.BCM1.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
+SHMS BCM2 Beam Cut Current: {P.BCM2.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
+SHMS BCM4A Beam Cut Current: {P.BCM4A.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
+SHMS BCM4B Beam Cut Current: {P.BCM4B.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
+SHMS BCM4C Beam Cut Current: {P.BCM4C.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
+SHMS Unser Beam Cut Current: {P.Unser.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
SHMS BCM1 Beam Cut Charge: {P.BCM1.scalerChargeCut/1000.:%.3f} mC
SHMS BCM2 Beam Cut Charge: {P.BCM2.scalerChargeCut/1000.:%.3f} mC
@@ -138,24 +138,24 @@ HMS Accepted Physics Triggers : {HMS_physics_accepted.npassed}
= Coin Trigger TDC Data scalers
=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:
-Coin ROC2 pTRIG1 passed: {pTRIG1_ROC2.npassed}
-Coin ROC2 pTRIG2 passed: {pTRIG2_ROC2.npassed}
-Coin ROC2 pTRIG3 passed: {pTRIG3_ROC2.npassed}
-Coin ROC2 pTRIG4 passed: {pTRIG4_ROC2.npassed}
-Coin ROC2 pTRIG5 passed: {pTRIG5_ROC2.npassed}
-Coin ROC2 pTRIG6 passed: {pTRIG6_ROC2.npassed}
-
-Coin ROC1 pTRIG1 passed: {pTRIG1_ROC1.npassed}
-Coin ROC1 pTRIG2 passed: {pTRIG2_ROC1.npassed}
-Coin ROC1 pTRIG3 passed: {pTRIG3_ROC1.npassed}
-Coin ROC1 pTRIG4 passed: {pTRIG4_ROC1.npassed}
-Coin ROC1 pTRIG5 passed: {pTRIG5_ROC1.npassed}
-Coin ROC1 pTRIG6 passed: {pTRIG6_ROC1.npassed}
-
-HMS Singles Triggers : {HMS_event.npassed}
+Coin ROC2 pTRIG1 Accepted Triggers : {pTRIG1_ROC2.npassed}
+Coin ROC2 pTRIG2 Accepted Triggers : {pTRIG2_ROC2.npassed}
+Coin ROC2 pTRIG3 Accepted Triggers : {pTRIG3_ROC2.npassed}
+Coin ROC2 pTRIG4 Accepted Triggers : {pTRIG4_ROC2.npassed}
+Coin ROC2 pTRIG5 Accepted Triggers : {pTRIG5_ROC2.npassed}
+Coin ROC2 pTRIG6 Accepted Triggers : {pTRIG6_ROC2.npassed}
+
+Coin ROC1 pTRIG1 Accepted Triggers : {pTRIG1_ROC1.npassed}
+Coin ROC1 pTRIG2 Accepted Triggers : {pTRIG2_ROC1.npassed}
+Coin ROC1 pTRIG3 Accepted Triggers : {pTRIG3_ROC1.npassed}
+Coin ROC1 pTRIG4 Accepted Triggers : {pTRIG4_ROC1.npassed}
+Coin ROC1 pTRIG5 Accepted Triggers : {pTRIG5_ROC1.npassed}
+Coin ROC1 pTRIG6 Accepted Triggers : {pTRIG6_ROC1.npassed}
+
+HMS Singles Triggers : {HMS_event.npassed}
SHMS Singles Triggers : {SHMS_event.npassed}
-Coincidence Triggers : {COIN_ONLY_event.npassed}
-All triggers : {ALL_events.npassed}
+Coincidence Triggers : {ALL_COIN_events.npassed}
+All Triggers : {ALL_events.npassed}
=:=:=:=:=:=:=:=:=:=:=:=:
= SHMS Trigger Scalers
@@ -168,19 +168,19 @@ SHMS_pEL_REAL : {P.pEL_REAL.scaler} [ {(P.pEL_REAL.scaler/P.1MHz.scalerTime)
SHMS_pEL_CLEAN : {P.pEL_CLEAN.scaler} [ {(P.pEL_CLEAN.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
SHMS_pSTOF : {P.pSTOF.scaler} [ {(P.pSTOF.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_pTRIG1 : {P.pTRIG1.scaler} [ {(P.pTRIG1.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_pTRIG2 : {P.pTRIG2.scaler} [ {(P.pTRIG2.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_pTRIG3 : {P.pTRIG3.scaler} [ {(P.pTRIG3.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_pTRIG4 : {P.pTRIG4.scaler} [ {(P.pTRIG4.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_pTRIG5 : {P.pTRIG5.scaler} [ {(P.pTRIG5.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_pTRIG6 : {P.pTRIG6.scaler} [ {(P.pTRIG6.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG1 Pre-triggers : {P.pTRIG1.scaler} [ {(P.pTRIG1.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG2 Pre-triggers : {P.pTRIG2.scaler} [ {(P.pTRIG2.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG3 Pre-triggers : {P.pTRIG3.scaler} [ {(P.pTRIG3.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG4 Pre-triggers : {P.pTRIG4.scaler} [ {(P.pTRIG4.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG5 Pre-triggers : {P.pTRIG5.scaler} [ {(P.pTRIG5.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG6 Pre-triggers : {P.pTRIG6.scaler} [ {(P.pTRIG6.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_hTRIG1 : {P.hTRIG1.scaler} [ {(P.hTRIG1.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_hTRIG2 : {P.hTRIG2.scaler} [ {(P.hTRIG2.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_hTRIG3 : {P.hTRIG3.scaler} [ {(P.hTRIG3.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_hTRIG4 : {P.hTRIG4.scaler} [ {(P.hTRIG4.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_hTRIG5 : {P.hTRIG5.scaler} [ {(P.hTRIG5.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
-SHMS_hTRIG6 : {P.hTRIG6.scaler} [ {(P.hTRIG6.scaler/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG1 Pre-scaled Pre-triggers : {(P.pTRIG1.scaler/gHC_ti_ps_factors[0]):%.0f} [ {((P.pTRIG1.scaler/gHC_ti_ps_factors[0])/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG2 Pre-scaled Pre-triggers : {(P.pTRIG2.scaler/gHC_ti_ps_factors[1]):%.0f} [ {((P.pTRIG2.scaler/gHC_ti_ps_factors[1])/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG3 Pre-scaled Pre-triggers : {(P.pTRIG3.scaler/gHC_ti_ps_factors[2]):%.0f} [ {((P.pTRIG3.scaler/gHC_ti_ps_factors[2])/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG4 Pre-scaled Pre-triggers : {(P.pTRIG4.scaler/gHC_ti_ps_factors[3]):%.0f} [ {((P.pTRIG4.scaler/gHC_ti_ps_factors[3])/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG5 Pre-scaled Pre-triggers : {(P.pTRIG5.scaler/gHC_ti_ps_factors[4]):%.0f} [ {((P.pTRIG5.scaler/gHC_ti_ps_factors[4])/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
+SHMS_pTRIG6 Pre-scaled Pre-triggers : {(P.pTRIG6.scaler/gHC_ti_ps_factors[5]):%.0f} [ {((P.pTRIG6.scaler/gHC_ti_ps_factors[5])/P.1MHz.scalerTime)/1000.:%.3f} kHz ]
=:=:=:=:=:=:=:=:=:=:=:
= HMS Trigger Scalers
@@ -193,19 +193,19 @@ HMS_hEL_REAL : {H.hEL_REAL.scaler} [ {(H.hEL_REAL.scaler/H.1MHz.scalerTime)/100
HMS_hEL_CLEAN : {H.hEL_CLEAN.scaler} [ {(H.hEL_CLEAN.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
HMS_hSTOF : {H.hSTOF.scaler} [ {(H.hSTOF.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_hTRIG1 : {H.hTRIG1.scaler} [ {(H.hTRIG1.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_hTRIG2 : {H.hTRIG2.scaler} [ {(H.hTRIG2.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_hTRIG3 : {H.hTRIG3.scaler} [ {(H.hTRIG3.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_hTRIG4 : {H.hTRIG4.scaler} [ {(H.hTRIG4.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_hTRIG5 : {H.hTRIG5.scaler} [ {(H.hTRIG5.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_hTRIG6 : {H.hTRIG6.scaler} [ {(H.hTRIG6.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-
-HMS_pTRIG1 : {H.pTRIG1.scaler} [ {(H.pTRIG1.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_pTRIG2 : {H.pTRIG2.scaler} [ {(H.pTRIG2.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_pTRIG3 : {H.pTRIG3.scaler} [ {(H.pTRIG3.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_pTRIG4 : {H.pTRIG4.scaler} [ {(H.pTRIG4.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_pTRIG5 : {H.pTRIG5.scaler} [ {(H.pTRIG5.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
-HMS_pTRIG6 : {H.pTRIG6.scaler} [ {(H.pTRIG6.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG1 Pre-triggers : {H.pTRIG1.scaler} [ {(H.pTRIG1.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG2 Pre-triggers : {H.pTRIG2.scaler} [ {(H.pTRIG2.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG3 Pre-triggers : {H.pTRIG3.scaler} [ {(H.pTRIG3.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG4 Pre-triggers : {H.pTRIG4.scaler} [ {(H.pTRIG4.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG5 Pre-triggers : {H.pTRIG5.scaler} [ {(H.pTRIG5.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG6 Pre-triggers : {H.pTRIG6.scaler} [ {(H.pTRIG6.scaler/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+
+HMS_pTRIG1 Pre-scaled Pre-triggers : {(H.pTRIG1.scaler/gHC_ti_ps_factors[0]):%.0f} [ {((H.pTRIG1.scaler/gHC_ti_ps_factors[0])/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG2 Pre-scaled Pre-triggers : {(H.pTRIG2.scaler/gHC_ti_ps_factors[1]):%.0f} [ {((H.pTRIG2.scaler/gHC_ti_ps_factors[1])/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG3 Pre-scaled Pre-triggers : {(H.pTRIG3.scaler/gHC_ti_ps_factors[2]):%.0f} [ {((H.pTRIG3.scaler/gHC_ti_ps_factors[2])/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG4 Pre-scaled Pre-triggers : {(H.pTRIG4.scaler/gHC_ti_ps_factors[3]):%.0f} [ {((H.pTRIG4.scaler/gHC_ti_ps_factors[3])/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG5 Pre-scaled Pre-triggers : {(H.pTRIG5.scaler/gHC_ti_ps_factors[4]):%.0f} [ {((H.pTRIG5.scaler/gHC_ti_ps_factors[4])/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
+HMS_pTRIG6 Pre-scaled Pre-triggers : {(H.pTRIG6.scaler/gHC_ti_ps_factors[5]):%.0f} [ {((H.pTRIG6.scaler/gHC_ti_ps_factors[5])/H.1MHz.scalerTime)/1000.:%.3f} kHz ]
=:=:=:=:
= EDTM
diff --git a/TEMPLATES/COIN/SCALERS/coinscalers.template b/TEMPLATES/COIN/SCALERS/coinscalers.template
index 885a1e0335d55945590e085bfd436274b2c222e6..eab741e15032f1e346c7fe14309c376708d7a563 100644
--- a/TEMPLATES/COIN/SCALERS/coinscalers.template
+++ b/TEMPLATES/COIN/SCALERS/coinscalers.template
@@ -38,12 +38,12 @@ HMS BCM4C Charge: {H.BCM4C.scalerCharge:%.3f} uC
HMS Unser Charge: {H.Unser.scalerCharge:%.3f} uC
Cut on BCM{gBCM_Current_threshold_index+1} current of {gBCM_Current_threshold} uA. Beam over threshold for {H.1MHz.scalerTimeCut:%.3f}s, or {((H.1MHz.scalerTimeCut/H.1MHz.scalerTime)*100.):%.3f}% of total run time.
-HMS BCM1 Beam Cut Current: {H.BCM1.scalerCharge/H.1MHz.scalerTime:%.3f} uA
-HMS BCM2 Beam Cut Current: {H.BCM2.scalerCharge/H.1MHz.scalerTime:%.3f} uA
-HMS BCM4A Beam Cut Current: {H.BCM4A.scalerCharge/H.1MHz.scalerTime:%.3f} uA
-HMS BCM4B Beam Cut Current: {H.BCM4B.scalerCharge/H.1MHz.scalerTime:%.3f} uA
-HMS BCM4C Beam Cut Current: {H.BCM4C.scalerCharge/H.1MHz.scalerTime:%.3f} uA
-HMS Unser Beam Cut Current: {H.Unser.scalerCharge/H.1MHz.scalerTime:%.3f} uA
+HMS BCM1 Beam Cut Current: {H.BCM1.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
+HMS BCM2 Beam Cut Current: {H.BCM2.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
+HMS BCM4A Beam Cut Current: {H.BCM4A.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
+HMS BCM4B Beam Cut Current: {H.BCM4B.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
+HMS BCM4C Beam Cut Current: {H.BCM4C.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
+HMS Unser Beam Cut Current: {H.Unser.scalerChargeCut/H.1MHz.scalerTimeCut:%.3f} uA
HMS BCM1 Beam Cut Charge: {H.BCM1.scalerChargeCut:%.3f} uC
HMS BCM2 Beam Cut Charge: {H.BCM2.scalerChargeCut:%.3f} uC
@@ -69,12 +69,12 @@ SHMS BCM4C Charge: {P.BCM4C.scalerCharge:%.3f} uC
SHMS Unser Charge: {P.Unser.scalerCharge:%.3f} uC
Cut on BCM{gBCM_Current_threshold_index+1} current of {gBCM_Current_threshold} uA. Beam over threshold for {P.1MHz.scalerTimeCut:%.3f}s, or {((P.1MHz.scalerTimeCut/P.1MHz.scalerTime)*100.):%.3f}% of total run time.
-SHMS BCM1 Beam Cut Current: {P.BCM1.scalerCharge/P.1MHz.scalerTime:%.3f} uA
-SHMS BCM2 Beam Cut Current: {P.BCM2.scalerCharge/P.1MHz.scalerTime:%.3f} uA
-SHMS BCM4A Beam Cut Current: {P.BCM4A.scalerCharge/P.1MHz.scalerTime:%.3f} uA
-SHMS BCM4B Beam Cut Current: {P.BCM4B.scalerCharge/P.1MHz.scalerTime:%.3f} uA
-SHMS BCM4C Beam Cut Current: {P.BCM4C.scalerCharge/P.1MHz.scalerTime:%.3f} uA
-SHMS Unser Beam Cut Current: {P.Unser.scalerCharge/P.1MHz.scalerTime:%.3f} uA
+SHMS BCM1 Beam Cut Current: {P.BCM1.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
+SHMS BCM2 Beam Cut Current: {P.BCM2.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
+SHMS BCM4A Beam Cut Current: {P.BCM4A.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
+SHMS BCM4B Beam Cut Current: {P.BCM4B.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
+SHMS BCM4C Beam Cut Current: {P.BCM4C.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
+SHMS Unser Beam Cut Current: {P.Unser.scalerChargeCut/P.1MHz.scalerTimeCut:%.3f} uA
SHMS BCM1 Beam Cut Charge: {P.BCM1.scalerChargeCut:%.3f} uC
SHMS BCM2 Beam Cut Charge: {P.BCM2.scalerChargeCut:%.3f} uC
@@ -82,6 +82,10 @@ SHMS BCM4A Beam Cut Charge: {P.BCM4A.scalerChargeCut:%.3f} uC
SHMS BCM4B Beam Cut Charge: {P.BCM4B.scalerChargeCut:%.3f} uC
SHMS BCM4C Beam Cut Charge: {P.BCM4C.scalerChargeCut:%.3f} uC
SHMS Unser Beam Cut Charge: {P.Unser.scalerChargeCut:%.3f} uC
+
+SHMS TRIG1 cut rate : {P.pTRIG1.scalerCut/P.1MHz.scalerTimeCut/1000} kHz
+SHMS TRIG3 cut rate : {P.pTRIG3.scalerCut/P.1MHz.scalerTimeCut/1000} kHz
+SHMS TRIG5 cut rate : {P.pTRIG5.scalerCut/P.1MHz.scalerTimeCut/1000} kHz
********************
@@ -110,6 +114,10 @@ SHMS 3/4 Trigger Rate : {P.pTRIG1.scalerRate/1000.:%.3f} kHz
Accepted SHMS Triggers : {pTRIG1_ROC2.npassed}
SHMS Event Types : {SHMS_Pretrig.npassed}
+
+SHMS TRIG5 Computer Live Time : {(pTRIG5_ROC2.npassed / P.pTRIG5.scaler)*100.0:%3.4f} % [ {(pTRIG5_ROC2.npassed / (P.pTRIG5.scaler/gpconfig_ti_ps_factors[4]))*100.0:%3.4f} % ]
+SHMS TRIG5 Computer Dead Time : {100.0 - (pTRIG5_ROC2.npassed / P.pTRIG5.scaler)*100.0:%3.4f} % [ {100.0 - (pTRIG5_ROC2.npassed / (P.pTRIG5.scaler/gpconfig_ti_ps_factors[4]))*100.0:%3.4f} % ]
+
=:=:=:=:=:=:=:=:=:
= HMS 3/4 Trigger
=:=:=:=:=:=:=:=:=:
@@ -306,6 +314,9 @@ ROC2 Pre-Scaled Ps3 ROC2 Computer Dead Time : {100.0 - (pTRIG3_ROC2.npassed / (P
ROC2 Pre-Scaled Ps4 ROC2 Computer Live Time : {(pTRIG4_ROC2.npassed / (P.pTRIG4.scaler/gpconfig_ti_ps_factors[3]))*100.0:%3.4f} %
ROC2 Pre-Scaled Ps4 ROC2 Computer Dead Time : {100.0 - (pTRIG4_ROC2.npassed / (P.pTRIG4.scaler/gpconfig_ti_ps_factors[3]))*100.0:%3.4f} %
+ROC2 Pre-Scaled Ps5 ROC2 Computer Live Time : {(pTRIG5_ROC2.npassed / (P.pTRIG5.scaler/gpconfig_ti_ps_factors[4]))*100.0:%3.4f} %
+ROC2 Pre-Scaled Ps5 ROC2 Computer Dead Time : {100.0 - (pTRIG5_ROC2.npassed / (P.pTRIG5.scaler/gpconfig_ti_ps_factors[4]))*100.0:%3.4f} %
+
ROC2 Pre-Scaled Ps6 ROC2 Computer Live Time : {(pTRIG6_ROC2.npassed / (P.pTRIG6.scaler/gpconfig_ti_ps_factors[5]))*100.0:%3.4f} %
ROC2 Pre-Scaled Ps6 ROC2 Computer Dead Time : {100.0 - (pTRIG6_ROC2.npassed / (P.pTRIG6.scaler/gpconfig_ti_ps_factors[5]))*100.0:%3.4f} %
diff --git a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
index 0f3178e9f86b78f2acc0e0e67b009a3fecc35785..33588ba717b524850bef13e0c7a40ae3fdf2f43b 100644
--- a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
+++ b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
@@ -361,7 +361,6 @@ Tracks found = scleantrack = {hcut_CleanTrack.npassed}
//Tracks passing chisquared cut = (hstat_cal_numevents:%7d) (in previous template, do we need this here?)
hmsPreShower Counts: {H.cal.stat_trksum1} eff : {H.cal.stat_hitsum1 / H.cal.stat_trksum1}
-hmsShowerArray Counts: {H.cal.stat_trksum_array} eff : {H.cal.stat_hitsum_array / H.cal.stat_trksum_array}
hA Counts: {H.cal.stat_trksum1} eff : {H.cal.stat_hitsum1 / H.cal.stat_trksum1}
hB Counts: {H.cal.stat_trksum2} eff : {H.cal.stat_hitsum2 / H.cal.stat_trksum2}
diff --git a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
index 9cfabf556c362c73c4d1c9bf8ce8009fdd7e5dc0..e8c18c0bcf026cf5358a702f74bf169ace394ad6 100644
--- a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
+++ b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
@@ -66,8 +66,9 @@ SHMS 3/4 Trigger Rate : {P.pTRIG1.scalerRate/1000.:%.3f} kHz
Accepted SHMS Triggers : {pcut_TRIG1.npassed}
SHMS Event Types : {SHMS_Pretrig.npassed}
-SHMS Computer Live Time : {(pcut_TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {(pcut_TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
-SHMS Computer Dead Time : {100.0 - (pcut_TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (pcut_TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
+
+SHMS TRIG5 Computer Live Time : {(pcut_TRIG5.npassed / P.pTRIG5.scaler)*100.0:%3.4f} % [ {(pcut_TRIG5.npassed / (P.pTRIG5.scaler/gpconfig_ti_ps_factors[4]))*100.0:%3.4f} % ]
+SHMS TRIG5 Computer Dead Time : {100.0 - (pcut_TRIG5.npassed / P.pTRIG5.scaler)*100.0:%3.4f} % [ {100.0 - (pcut_TRIG5.npassed / (P.pTRIG5.scaler/gpconfig_ti_ps_factors[4]))*100.0:%3.4f} % ]
=:=:=:=:=:=:=:=:=:=:=:=:
= Physics 3/4 Triggers
@@ -134,14 +135,14 @@ Total Dead Time (EDTM) : {100.0 - (pcut_edtm_accepted.npassed / P.EDTM.scaler)*1
SHMS Computer Live Time : {(pcut_TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} %
SHMS Computer Dead Time : {100.0 - (pcut_TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} %
-Pre-Scaled Ps1 SHMS Computer Live Time : {(pcut_TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
-Pre-Scaled Ps1 SHMS Computer Dead Time : {100.0 - (pcut_TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 SHMS Computer Live Time : {((pcut_TRIG1.npassed-pcut_TRIG5.npassed) / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 SHMS Computer Dead Time : {100.0 - ( (pcut_TRIG1.npassed-pcut_TRIG5.npassed) / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
-Pre-Scaled Ps2 SHMS Computer Live Time : {(pcut_TRIG2.npassed / (P.pTRIG2.scaler/gpconfig_ti_ps_factors[1]))*100.0:%3.4f} %
-Pre-Scaled Ps2 SHMS Computer Dead Time : {100.0 - (pcut_TRIG2.npassed / (P.pTRIG2.scaler/gpconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps3 SHMS Computer Live Time : {((pcut_TRIG3.npassed-pcut_TRIG5.npassed) / (P.pTRIG3.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps3 SHMS Computer Dead Time : {100.0 - ((pcut_TRIG3.npassed-pcut_TRIG5.npassed) / (P.pTRIG3.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
-Pre-Scaled Ps3 SHMS Computer Live Time : {(pcut_TRIG3.npassed / (P.pTRIG3.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
-Pre-Scaled Ps3 SHMS Computer Dead Time : {100.0 - (pcut_TRIG3.npassed / (P.pTRIG3.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps5 SHMS Computer Live Time : {(pcut_TRIG5.npassed / (P.pTRIG5.scaler/gpconfig_ti_ps_factors[4]))*100.0:%3.4f} %
+Pre-Scaled Ps5 SHMS Computer Dead Time : {100.0 - (pcut_TRIG5.npassed / (P.pTRIG5.scaler/gpconfig_ti_ps_factors[4]))*100.0:%3.4f} %
Total Live Time (EDTM) : {(pcut_edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
Total Dead Time (EDTM) : {100.0 - (pcut_edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
diff --git a/UTIL_KAONLT b/UTIL_KAONLT
index d064a77b9d5a5d2c5a40ce220615b363bc565b14..bcff131ff80520694848bc9337e3551d4ecf6545 160000
--- a/UTIL_KAONLT
+++ b/UTIL_KAONLT
@@ -1 +1 @@
-Subproject commit d064a77b9d5a5d2c5a40ce220615b363bc565b14
+Subproject commit bcff131ff80520694848bc9337e3551d4ecf6545
diff --git a/UTIL_OL b/UTIL_OL
index 35df88c876461f85fd752c838bd8cec00433f915..4d22a362a954a6f2b458f13ed63fa6cc94abda93 160000
--- a/UTIL_OL
+++ b/UTIL_OL
@@ -1 +1 @@
-Subproject commit 35df88c876461f85fd752c838bd8cec00433f915
+Subproject commit 4d22a362a954a6f2b458f13ed63fa6cc94abda93
diff --git a/UTIL_SIDIS b/UTIL_SIDIS
index d72d83f045052cf24aabb35738ebcbe923da658b..1c29348640e5117e20b67781c2805fc23ea52c9d 160000
--- a/UTIL_SIDIS
+++ b/UTIL_SIDIS
@@ -1 +1 @@
-Subproject commit d72d83f045052cf24aabb35738ebcbe923da658b
+Subproject commit 1c29348640e5117e20b67781c2805fc23ea52c9d
diff --git a/macros/ped_trk.C b/macros/ped_trk.C
new file mode 100644
index 0000000000000000000000000000000000000000..77e7ff9f0e4c7240e8833f96bd05755388c0a0b2
--- /dev/null
+++ b/macros/ped_trk.C
@@ -0,0 +1,158 @@
+
+
+// static const Int_t numRuns = 8;
+static const Int_t numRuns = 6;
+static const Int_t numLayers = 4;
+// static const Int_t numPidLegs = 3;
+static const Int_t numPidLegs = 2;
+
+Int_t irun, ilayer, pid;
+// Int_t runList[numRuns] = {4681, 4709, 4745, 4786, 4817, 4828, 4876, 4900};
+Int_t runList[numRuns] = {4800, 4825, 4866, 4897, 4922, 4938};
+// Int_t colorList[numRuns] = {1, 2, 4, 6, 7, 8, 9, 28};
+Int_t colorList[numRuns] = {1, 2, 4, 6, 7, 8};
+// Int_t fillList[numRuns] = {3004, 3005, 3006, 3007, 3016, 3020, 3021, 3022};
+// Int_t fillList[numRuns] = {3003, 3003, 3003, 3003, 3003, 3003, 3003, 3003};
+Int_t fillList[numRuns] = {3003, 3003, 3003, 3003, 3003, 3003};
+Double_t normFactor;
+
+TH1F *layerHistos[numLayers];
+TH1F *hASum[numRuns], *hBSum[numRuns], *hCSum[numRuns], *hDSum[numRuns];
+TH1F *hPreShwr[numRuns], *hShwr[numRuns], *hCerSum[numRuns], *pPreShwr[numRuns], *pHgcSum[numRuns];
+
+TFile *rif[numRuns];
+
+TCanvas *layerCan, *pidLegCan;
+
+TLegend *layerLeg[numLayers], *pidLeg[numPidLegs];
+
+void ped_trk() {
+
+ layerCan = new TCanvas("layerCan", "layerCan", 1600, 1600);
+ layerCan->Divide(2, 2);
+
+ pidLegCan = new TCanvas("pidLegCan", "pidLegCan", 1600, 1600);
+ pidLegCan->Divide(2, 1);
+
+ for (ilayer = 0; ilayer < numLayers; ilayer++)
+ layerLeg[ilayer] = new TLegend(0.1, 0.6, 0.2, 0.9);
+
+ for (ipid = 0; ipid < numPidLegs; ipid++)
+ pidLeg[ipid] = new TLegend(0.1, 0.6, 0.2, 0.9);
+
+
+ for (irun = 0; irun < numRuns; irun++) {
+
+ // rif[irun] = new TFile(Form("ROOTfiles/hms_coin_replay_production_%d_50000.root", runList[irun]), "READ");
+ rif[irun] = new TFile(Form("ROOTfiles/shms_coin_replay_production_%d_50000.root", runList[irun]), "READ");
+
+ // layerCan->cd(1);
+ // hASum[irun] = dynamic_cast <TH1F*> (rif[irun]->FindObjectAny("htrig_hASum_adc_pped"));
+ // hASum[irun]->SetLineColor(colorList[irun]);
+ // hASum[irun]->SetFillColor(colorList[irun]);
+ // hASum[irun]->SetFillStyle(fillList[irun]);
+ // normFactor = hASum[irun]->GetEntries();
+ // hASum[irun]->Scale(1./normFactor);
+ // hASum[irun]->Draw("hist same");
+ // hASum[irun]->GetYaxis()->SetRangeUser(0, 0.4);
+ // layerLeg[0]->AddEntry(hASum[irun], Form("Run %d", runList[irun]));
+ // layerLeg[0]->Draw();
+
+ // layerCan->cd(2);
+ // hBSum[irun] = dynamic_cast <TH1F*> (rif[irun]->FindObjectAny("htrig_hBSum_adc_pped"));
+ // hBSum[irun]->SetLineColor(colorList[irun]);
+ // hBSum[irun]->SetFillColor(colorList[irun]);
+ // hBSum[irun]->SetFillStyle(fillList[irun]);
+ // normFactor = hBSum[irun]->GetEntries();
+ // hBSum[irun]->Scale(1./normFactor);
+ // hBSum[irun]->Draw("hist same");
+ // hBSum[irun]->GetYaxis()->SetRangeUser(0, 0.4);
+ // layerLeg[1]->AddEntry(hBSum[irun], Form("Run %d", runList[irun]));
+ // layerLeg[1]->Draw();
+
+ // layerCan->cd(3);
+ // hCSum[irun] = dynamic_cast <TH1F*> (rif[irun]->FindObjectAny("htrig_hCSum_adc_pped"));
+ // hCSum[irun]->SetLineColor(colorList[irun]);
+ // hCSum[irun]->SetFillColor(colorList[irun]);
+ // hCSum[irun]->SetFillStyle(fillList[irun]);
+ // normFactor = hCSum[irun]->GetEntries();
+ // hCSum[irun]->Scale(1./normFactor);
+ // hCSum[irun]->Draw("hist same");
+ // hCSum[irun]->GetYaxis()->SetRangeUser(0, 0.4);
+ // layerLeg[2]->AddEntry(hCSum[irun], Form("Run %d", runList[irun]));
+ // layerLeg[2]->Draw();
+
+ // layerCan->cd(4);
+ // hDSum[irun] = dynamic_cast <TH1F*> (rif[irun]->FindObjectAny("htrig_hDSum_adc_pped"));
+ // hDSum[irun]->SetLineColor(colorList[irun]);
+ // hDSum[irun]->SetFillColor(colorList[irun]);
+ // hDSum[irun]->SetFillStyle(fillList[irun]);
+ // normFactor = hDSum[irun]->GetEntries();
+ // hDSum[irun]->Scale(1./normFactor);
+ // hDSum[irun]->Draw("hist same");
+ // hDSum[irun]->GetYaxis()->SetRangeUser(0, 0.4);
+ // layerLeg[3]->AddEntry(hDSum[irun], Form("Run %d", runList[irun]));
+ // layerLeg[3]->Draw();
+
+ // pidLegCan->cd(1);
+ // hPreShwr[irun] = dynamic_cast <TH1F*> (rif[irun]->FindObjectAny("htrig_hpreShwr_adc_pped"));
+ // hPreShwr[irun]->SetLineColor(colorList[irun]);
+ // hPreShwr[irun]->SetFillColor(colorList[irun]);
+ // hPreShwr[irun]->SetFillStyle(fillList[irun]);
+ // normFactor = hPreShwr[irun]->GetEntries();
+ // hPreShwr[irun]->Scale(1./normFactor);
+ // hPreShwr[irun]->Draw("hist same");
+ // hPreShwr[irun]->GetYaxis()->SetRangeUser(0, 0.4);
+ // pidLeg[0]->AddEntry(hPreShwr[irun], Form("Run %d", runList[irun]));
+ // pidLeg[0]->Draw();
+
+ // pidLegCan->cd(2);
+ // hShwr[irun] = dynamic_cast <TH1F*> (rif[irun]->FindObjectAny("htrig_hshwr_adc_pped"));
+ // hShwr[irun]->SetLineColor(colorList[irun]);
+ // hShwr[irun]->SetFillColor(colorList[irun]);
+ // hShwr[irun]->SetFillStyle(fillList[irun]);
+ // normFactor = hShwr[irun]->GetEntries();
+ // hShwr[irun]->Scale(1./normFactor);
+ // hShwr[irun]->Draw("hist same");
+ // hShwr[irun]->GetYaxis()->SetRangeUser(0, 0.4);
+ // pidLeg[1]->AddEntry(hShwr[irun], Form("Run %d", runList[irun]));
+ // pidLeg[1]->Draw();
+
+ // pidLegCan->cd(3);
+ // hCerSum[irun] = dynamic_cast <TH1F*> (rif[irun]->FindObjectAny("htrig_hcersum_adc_pped"));
+ // hCerSum[irun]->SetLineColor(colorList[irun]);
+ // hCerSum[irun]->SetFillColor(colorList[irun]);
+ // hCerSum[irun]->SetFillStyle(fillList[irun]);
+ // normFactor = hCerSum[irun]->GetEntries();
+ // hCerSum[irun]->Scale(1./normFactor);
+ // hCerSum[irun]->Draw("hist same");
+ // hCerSum[irun]->GetYaxis()->SetRangeUser(0, 0.4);
+ // pidLeg[2]->AddEntry(hCerSum[irun], Form("Run %d", runList[irun]));
+ // pidLeg[2]->Draw();
+
+ pidLegCan->cd(1);
+ pPreShwr[irun] = dynamic_cast <TH1F*> (rif[irun]->FindObjectAny("ptrig_prshwr_sum_pped"));
+ pPreShwr[irun]->SetLineColor(colorList[irun]);
+ pPreShwr[irun]->SetFillColor(colorList[irun]);
+ pPreShwr[irun]->SetFillStyle(fillList[irun]);
+ normFactor = pPreShwr[irun]->GetEntries();
+ pPreShwr[irun]->Scale(1./normFactor);
+ pPreShwr[irun]->Draw("hist same");
+ pPreShwr[irun]->GetYaxis()->SetRangeUser(0, 0.5);
+ pidLeg[0]->AddEntry(pPreShwr[irun], Form("Run %d", runList[irun]));
+ pidLeg[0]->Draw();
+
+ pidLegCan->cd(2);
+ pHgcSum[irun] = dynamic_cast <TH1F*> (rif[irun]->FindObjectAny("ptrig_phgc_sum_pped"));
+ pHgcSum[irun]->SetLineColor(colorList[irun]);
+ pHgcSum[irun]->SetFillColor(colorList[irun]);
+ pHgcSum[irun]->SetFillStyle(fillList[irun]);
+ normFactor = pHgcSum[irun]->GetEntries();
+ pHgcSum[irun]->Scale(1./normFactor);
+ pHgcSum[irun]->Draw("hist same");
+ pHgcSum[irun]->GetYaxis()->SetRangeUser(0, 0.5);
+ pidLeg[1]->AddEntry(pHgcSum[irun], Form("Run %d", runList[irun]));
+ pidLeg[1]->Draw();
+
+ }
+}
diff --git a/onlineGUI/CONFIG/HMS/PRODUCTION/hms_coin_production.cfg b/onlineGUI/CONFIG/HMS/PRODUCTION/hms_coin_production.cfg
index 9050d2839711c0ba705779507b3b4da64b7e32e8..28e2e10089ac40d7be3a05c17179473dedf7990b 100644
--- a/onlineGUI/CONFIG/HMS/PRODUCTION/hms_coin_production.cfg
+++ b/onlineGUI/CONFIG/HMS/PRODUCTION/hms_coin_production.cfg
@@ -46,6 +46,15 @@ macro 'UTIL/GEN/ped_tracking.C("../ROOTfiles/hms_coin_replay_production_golden.r
macro 'UTIL/GEN/ped_tracking.C("../ROOTfiles/hms_coin_replay_production_golden.root","hodo_2x","h",2)' -nostat
macro 'UTIL/GEN/ped_tracking.C("../ROOTfiles/hms_coin_replay_production_golden.root","hodo_2y","h",2)' -nostat
+newpage 2 3
+title HMS Drift Chamber Wire Maps (all hits)
+macro UTIL/GEN/overlay2.C("hdc1u1_rawwirenum","hdc2v1_rawwirenum","1U1","2V1")
+macro UTIL/GEN/overlay2.C("hdc1u2_rawwirenum","hdc2v2_rawwirenum","1U2","2V2")
+macro UTIL/GEN/overlay2.C("hdc1x1_rawwirenum","hdc2x1_rawwirenum","1X1","2X1")
+macro UTIL/GEN/overlay2.C("hdc1x2_rawwirenum","hdc2x2_rawwirenum","1X2","2X2")
+macro UTIL/GEN/overlay2.C("hdc1v1_rawwirenum","hdc2u1_rawwirenum","1V1","2U1")
+macro UTIL/GEN/overlay2.C("hdc1v2_rawwirenum","hdc2u2_rawwirenum","1V2","2U2")
+
newpage 2 3
title HMS Drift Chamber Wire Maps
macro UTIL/GEN/overlay2.C("hdc1u1_wirenum","hdc2v1_wirenum","1U1","2V1")
@@ -73,6 +82,24 @@ macro UTIL/GEN/overlay2.C("hdc1x2_drifttime","hdc2x2_drifttime","1X2","2X2")
macro UTIL/GEN/overlay2.C("hdc1v1_drifttime","hdc2u1_drifttime","1V1","2U1")
macro UTIL/GEN/overlay2.C("hdc1v2_drifttime","hdc2u2_drifttime","1V2","2U2")
+newpage 2 3
+title HMS Drift Chamber 1 Efficiency
+macro UTIL/GEN/dcwire_efficiency.C("hdc1x1_wirenum_did","hdc1x1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc1x2_wirenum_did","hdc1x2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc1u1_wirenum_did","hdc1u1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc1u2_wirenum_did","hdc1u2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc1v1_wirenum_did","hdc1v1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc1v2_wirenum_did","hdc1v2_wirenum_should")
+
+newpage 2 3
+title HMS Drift Chamber 2 Efficiency
+macro UTIL/GEN/dcwire_efficiency.C("hdc2x1_wirenum_did","hdc2x1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc2x2_wirenum_did","hdc2x2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc2u1_wirenum_did","hdc2u1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc2u2_wirenum_did","hdc2u2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc2v1_wirenum_did","hdc2v1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc2v2_wirenum_did","hdc2v2_wirenum_should")
+
newpage 3 2 logz
title HMS Focal Plane
hdc_xfp_vs_yfp -nostat
@@ -232,7 +259,8 @@ title ROC3 Sync Check
hms_dcref_vs_hodoref -nostat -type box
newpage 4 2
-title SHMS Trigger Pedestal Tracking
+#newpage 3 1
+title HMS Trigger Pedestal Tracking
macro 'UTIL/GEN/ped_tracking_trigger.C("../ROOTfiles/hms_coin_replay_production_golden.root","ASum","h")' -nostat
macro 'UTIL/GEN/ped_tracking_trigger.C("../ROOTfiles/hms_coin_replay_production_golden.root","BSum","h")' -nostat
macro 'UTIL/GEN/ped_tracking_trigger.C("../ROOTfiles/hms_coin_replay_production_golden.root","CSum","h")' -nostat
diff --git a/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production.cfg b/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production.cfg
index 94efb2170f7e986632fabf7971393b29f9728891..9746d74fcb169a08eae1a0d80600a4af03677774 100644
--- a/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production.cfg
+++ b/onlineGUI/CONFIG/HMS/PRODUCTION/hms_production.cfg
@@ -62,6 +62,24 @@ macro UTIL/GEN/overlay2.C("hdc1x2_drifttime","hdc2x2_drifttime","1X2","2X2")
macro UTIL/GEN/overlay2.C("hdc1v1_drifttime","hdc2u1_drifttime","1V1","2U1")
macro UTIL/GEN/overlay2.C("hdc1v2_drifttime","hdc2u2_drifttime","1V2","2U2")
+newpage 2 3
+title HMS Drift Chamber 1 Efficiency
+macro UTIL/GEN/dcwire_efficiency.C("hdc1x1_wirenum_did","hdc1x1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc1x2_wirenum_did","hdc1x2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc1u1_wirenum_did","hdc1u1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc1u2_wirenum_did","hdc1u2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc1v1_wirenum_did","hdc1v1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc1v2_wirenum_did","hdc1v2_wirenum_should")
+
+newpage 2 3
+title HMS Drift Chamber 2 Efficiency
+macro UTIL/GEN/dcwire_efficiency.C("hdc2x1_wirenum_did","hdc2x1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc2x2_wirenum_did","hdc2x2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc2u1_wirenum_did","hdc2u1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc2u2_wirenum_did","hdc2u2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc2v1_wirenum_did","hdc2v1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("hdc2v2_wirenum_did","hdc2v2_wirenum_should")
+
newpage 3 2 logz
title HMS Focal Plane
hdc_xfp_vs_yfp -nostat
diff --git a/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_coin_production.cfg b/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_coin_production.cfg
index 6b7a617ecdd97a12b250211c6053fd6363d34604..c9f8c3a1db2c563e75daf441ae58a9861b685aa8 100644
--- a/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_coin_production.cfg
+++ b/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_coin_production.cfg
@@ -46,6 +46,15 @@ macro 'UTIL/GEN/ped_tracking.C("../ROOTfiles/shms_coin_replay_production_golden.
macro 'UTIL/GEN/ped_tracking.C("../ROOTfiles/shms_coin_replay_production_golden.root","hodo_2x","p",2)' -nostat
macro 'UTIL/GEN/ped_tracking.C("../ROOTfiles/shms_coin_replay_production_golden.root","hodo_2y","p",2)' -nostat
+newpage 2 3
+title SHMS Drift Chamber Wire Maps (all hits)
+macro UTIL/GEN/overlay2.C("pdc1u1_rawwirenum","pdc2v1_rawwirenum","1U1","2V1")
+macro UTIL/GEN/overlay2.C("pdc1u2_rawwirenum","pdc2v2_rawwirenum","1U2","2V2")
+macro UTIL/GEN/overlay2.C("pdc1x1_rawwirenum","pdc2x1_rawwirenum","1X1","2X1")
+macro UTIL/GEN/overlay2.C("pdc1x2_rawwirenum","pdc2x2_rawwirenum","1X2","2X2")
+macro UTIL/GEN/overlay2.C("pdc1v1_rawwirenum","pdc2u1_rawwirenum","1V1","2U1")
+macro UTIL/GEN/overlay2.C("pdc1v2_rawwirenum","pdc2u2_rawwirenum","1V2","2U2")
+
newpage 2 3
title SHMS Drift Chamber Wire Maps
macro UTIL/GEN/overlay2.C("pdc1u1_wirenum","pdc2v1_wirenum","1U1","2V1")
@@ -73,6 +82,24 @@ macro UTIL/GEN/overlay2.C("pdc1x2_drifttime","pdc2x2_drifttime","1X2","2X2")
macro UTIL/GEN/overlay2.C("pdc1v1_drifttime","pdc2u1_drifttime","1V1","2U1")
macro UTIL/GEN/overlay2.C("pdc1v2_drifttime","pdc2u2_drifttime","1V2","2U2")
+newpage 2 3
+title SHMS Drift Chamber 1 Efficiency
+macro UTIL/GEN/dcwire_efficiency.C("pdc1x1_wirenum_did","pdc1x1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc1x2_wirenum_did","pdc1x2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc1u1_wirenum_did","pdc1u1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc1u2_wirenum_did","pdc1u2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc1v1_wirenum_did","pdc1v1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc1v2_wirenum_did","pdc1v2_wirenum_should")
+
+newpage 2 3
+title SHMS Drift Chamber 2 Efficiency
+macro UTIL/GEN/dcwire_efficiency.C("pdc2x1_wirenum_did","pdc2x1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc2x2_wirenum_did","pdc2x2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc2u1_wirenum_did","pdc2u1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc2u2_wirenum_did","pdc2u2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc2v1_wirenum_did","pdc2v1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc2v2_wirenum_did","pdc2v2_wirenum_should")
+
newpage 3 2 logz
title SHMS Focal Plane
pdc_xfp_vs_yfp -nostat
@@ -135,7 +162,7 @@ phgcer_xytrack -nostat
newpage 2 2
title SHMS Calorimeter Occ/Mult
macro 'UTIL/GEN/overlay2.C("pcal_prshwr_good_occ_pos","pcal_prshwr_good_occ_neg","PrSh+","PrSh-","SHMS PreShower Good Occupancy")' -nostat
-pcal_shwr_good_occ -nostat
+macro 'UTIL/GEN/flyeye_occupancy.C("pcal_shwr_good_occ")' -nostat
macro 'UTIL/GEN/overlay2.C("pcal_prshwr_good_mult_pos","pcal_prshwr_good_mult_neg","PrSh+","PrSh-","SHMS PreShower Good Multiplicity")' -nostat
pcal_shwr_good_mult -nostat
diff --git a/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg b/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg
index 51f1bad329232ea3b5ea6e8e5a6d4500ac29654f..b238c27a91fb90547b5a1de645de3670ac20570e 100644
--- a/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg
+++ b/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg
@@ -62,6 +62,24 @@ macro UTIL/GEN/overlay2.C("pdc1x2_drifttime","pdc2x2_drifttime","1X2","2X2")
macro UTIL/GEN/overlay2.C("pdc1v1_drifttime","pdc2u1_drifttime","1V1","2U1")
macro UTIL/GEN/overlay2.C("pdc1v2_drifttime","pdc2u2_drifttime","1V2","2U2")
+newpage 2 3
+title SHMS Drift Chamber 1 Efficiency
+macro UTIL/GEN/dcwire_efficiency.C("pdc1x1_wirenum_did","pdc1x1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc1x2_wirenum_did","pdc1x2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc1u1_wirenum_did","pdc1u1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc1u2_wirenum_did","pdc1u2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc1v1_wirenum_did","pdc1v1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc1v2_wirenum_did","pdc1v2_wirenum_should")
+
+newpage 2 3
+title SHMS Drift Chamber 2 Efficiency
+macro UTIL/GEN/dcwire_efficiency.C("pdc2x1_wirenum_did","pdc2x1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc2x2_wirenum_did","pdc2x2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc2u1_wirenum_did","pdc2u1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc2u2_wirenum_did","pdc2u2_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc2v1_wirenum_did","pdc2v1_wirenum_should")
+macro UTIL/GEN/dcwire_efficiency.C("pdc2v2_wirenum_did","pdc2v2_wirenum_should")
+
newpage 3 2 logz
title SHMS Focal Plane
pdc_xfp_vs_yfp -nostat
diff --git a/onlineGUI/UTIL/GEN/dcwire_efficiency.C b/onlineGUI/UTIL/GEN/dcwire_efficiency.C
index 6881abc970e54bd5341a6a4a23db8417b1715613..4990d1c9879583270081baf5d363cc973078a0fb 100644
--- a/onlineGUI/UTIL/GEN/dcwire_efficiency.C
+++ b/onlineGUI/UTIL/GEN/dcwire_efficiency.C
@@ -1,7 +1,7 @@
void dcwire_efficiency(TString hist1name, TString hist2name){
TH1F* H1;
TH1F* H2;
-
+
H1 = (TH1F*) gDirectory->Get(hist1name);
H2 = (TH1F*) gDirectory->Get(hist2name);
if (H1 && H2) {
@@ -10,13 +10,19 @@ void dcwire_efficiency(TString hist1name, TString hist2name){
TH1F* Hratio=(TH1F*)H1->Clone();
Hratio->Divide(H1,H2,1,1,"B");
Hratio->SetStats(0);
- Hratio->SetMinimum(0.0);
+ Hratio->SetMinimum(0.5);
Hratio->SetMaximum(1.05);
- Hratio->Draw("EP");
+ Hratio->SetMarkerStyle(21);
+ Hratio->SetMarkerSize(0.75);
+ Hratio->DrawClone("EP1");
Hratio->GetXaxis()->SetTitleOffset(.6);
- Hratio->GetXaxis()->SetTitleSize(0.08);
+ Hratio->GetXaxis()->SetTitleSize(0.15);
+ Hratio->GetYaxis()->SetTitle("Efficiency (%)");
Hratio->GetYaxis()->SetTitleOffset(.6);
- Hratio->GetYaxis()->SetTitleSize(0.08);
+ Hratio->GetYaxis()->SetTitleSize(0.15);
+ gPad->Update();
+ TLine *line = new TLine(0.0, 1.0, gPad->GetUxmax(), 1.0);
+ line->SetLineColor(kBlue); line->SetLineWidth(3); line->SetLineStyle(2); line->Draw();
} else {
if (!H1) cout << " Histogram " << hist1name << " does not exist" << endl;
if (!H2) cout << " Histogram " << hist2name << " does not exist" << endl;
diff --git a/onlineGUI/UTIL/GEN/flyeye_occupancy.C b/onlineGUI/UTIL/GEN/flyeye_occupancy.C
new file mode 100644
index 0000000000000000000000000000000000000000..ae6d54da8a0a5acfaea86c128cc86b32b608172d
--- /dev/null
+++ b/onlineGUI/UTIL/GEN/flyeye_occupancy.C
@@ -0,0 +1,33 @@
+#include <iostream>
+#include "TFile.h"
+#include "TH1D.h"
+
+
+void flyeye_occupancy(TString hist1name) {
+ TH1F* H1;
+ TH2F* cal2d;
+ Int_t cal_nrows=16.;
+ Int_t cal_ncols=14.;
+ Int_t cal_dist_diff=9.;
+
+
+ TString cal2dname=hist1name+"_2d";
+ H1 = (TH1F*) gDirectory->Get(hist1name);
+ cal2d = (TH2F*) gDirectory->Get(cal2dname);
+
+ if (!cal2d) {
+ // cal2d = new TH2F("cal2d","SHMS Calormeter occupancy ; Y (cm) ;X (cm)",14,-63,63,16,-72,72);
+ cal2d = new TH2F("cal2d","SHMS Shower Cccupancy ; Row Number ; Col Number",14,0,14,16,0,16);
+ for (Int_t iblk = 0; iblk < (H1->GetSize()-2); iblk++) {
+ Int_t col = iblk/cal_nrows+1;
+ Int_t row = iblk%cal_nrows+1;
+ Double_t Ypos_cal = (cal_ncols/2.-col)*cal_dist_diff;// horizontal position +Y left
+ Double_t Xpos_cal = (cal_nrows/2.-row)*cal_dist_diff; //vertical position +X down
+ // cout << iblk << " " << col << " " << row<< " " << Ypos_cal<< " " << Xpos_cal << endl;
+ cal2d->SetBinContent(col,row,H1->GetBinContent(iblk+1));
+ }
+
+ }
+ cal2d->SetStats(0);
+ cal2d->Draw("colz");
+}
diff --git a/onlineGUI/UTIL/GEN/ped_tracking.C b/onlineGUI/UTIL/GEN/ped_tracking.C
index 32e811c8bec806e44baf10d2d4c13f2f2877d7a6..5dd7d57ab45c4040f67b8f3e9511e9fc0839aefe 100644
--- a/onlineGUI/UTIL/GEN/ped_tracking.C
+++ b/onlineGUI/UTIL/GEN/ped_tracking.C
@@ -136,23 +136,34 @@ void ped_tracking(TString golden_file="", TString detector="", TString spect="",
gSystem->RedirectOutput("/dev/null","a");
- TH1D* Ped_Difference = new TH1D("Ped_Difference",Form("%s %s;PMT Number; Difference of Pedestal Means (mV)",detector.Data(),(polarity == 1) ? "+" : "-"),(H1_pmt->GetSize()-2),0.5,(H1_pmt->GetSize()-2)+0.5);
+ TH1D* Ped_Difference = new TH1D("Ped_Difference",Form("%s %s;PMT Number; (Gold - Present) Ped Means (mV)",detector.Data(),(polarity == 1) ? "+" : "-"),(H1_pmt->GetSize()-2),0.5,(H1_pmt->GetSize()-2)+0.5);
gSystem->RedirectOutput(0);
+ Double_t histmaxdiff = 0.;
for (Int_t ipmt = 0; ipmt < (H1_pmt->GetSize()-2); ipmt++) {
- Ped_Difference->SetBinContent(ipmt+1,(H1_pmt->GetBinContent(ipmt+1)-H2_pmt->GetBinContent(ipmt+1)));
+ Double_t peddiff=(H1_pmt->GetBinContent(ipmt+1)-H2_pmt->GetBinContent(ipmt+1));
+ if (TMath::Abs(peddiff) == 1e+38) {
+ if (H1_pmt->GetBinContent(ipmt+1) == 1e+38) {
+ peddiff =-H2_pmt->GetBinContent(ipmt+1);
+ }
+ if (H2_pmt->GetBinContent(ipmt+1) == 1e+38) peddiff =H1_pmt->GetBinContent(ipmt+1);
+ }
+ Ped_Difference->SetBinContent(ipmt+1,peddiff);
+ if ( TMath::Abs( peddiff ) >histmaxdiff) histmaxdiff=TMath::Abs(peddiff);
Ped_Difference->SetBinError(ipmt+1,sqrt(pow(H1_pmt->GetBinError(ipmt+1),2)+pow(H2_pmt->GetBinError(ipmt+1),2)));
}
+ histmaxdiff = histmaxdiff*1.2;
+ if (histmaxdiff < 15) histmaxdiff = 15;
//Start Drawing
gStyle->SetOptStat(0);
- Ped_Difference->SetAxisRange(-5,5,"Y");
+ Ped_Difference->SetAxisRange(-histmaxdiff,histmaxdiff,"Y");
Ped_Difference->SetMarkerStyle(8);
Ped_Difference->SetMarkerSize(1);
Ped_Difference->DrawClone("PE1");
gPad->Update();
- TLine *Lower_Limit = new TLine(gPad->GetUxmin(),-2,gPad->GetUxmax(),-2);
+ TLine *Lower_Limit = new TLine(gPad->GetUxmin(),-3.5,gPad->GetUxmax(),-3.5);
Lower_Limit->SetLineColor(kRed); Lower_Limit->SetLineWidth(3); Lower_Limit->SetLineStyle(2); Lower_Limit->Draw();
- TLine *Upper_Limit = new TLine(gPad->GetUxmin(),+2,gPad->GetUxmax(),+2);
+ TLine *Upper_Limit = new TLine(gPad->GetUxmin(),+3.5,gPad->GetUxmax(),+3.5);
Upper_Limit->SetLineColor(kRed); Upper_Limit->SetLineWidth(3); Upper_Limit->SetLineStyle(2); Upper_Limit->Draw();
Ped_Difference->~TH1D();
diff --git a/onlineGUI/UTIL/GEN/ped_tracking_trigger.C b/onlineGUI/UTIL/GEN/ped_tracking_trigger.C
index d38d8603e0331df9d99bca9bf266e4f09791318e..c0032398ea7710c382bc6267009200ca8708188d 100644
--- a/onlineGUI/UTIL/GEN/ped_tracking_trigger.C
+++ b/onlineGUI/UTIL/GEN/ped_tracking_trigger.C
@@ -103,22 +103,25 @@ void ped_tracking_trigger(TString golden_file="",TString trigger="", TString spe
proto_sigma = Gaussian->GetParameter(2);
gSystem->RedirectOutput("/dev/null","a");
- TH1D* Ped_Difference = new TH1D("Ped_Difference",Form("%s Trigger Leg;%s; Difference of Pedestal Means (mV)",trigger.Data(),histname.Data()),1,0.5,1.5);
+ TH1D* Ped_Difference = new TH1D("Ped_Difference",Form("%s Trigger Leg;%s; (Gold -Present) Ped Means (mV)",trigger.Data(),histname.Data()),1,0.5,1.5);
gSystem->RedirectOutput(0);
Ped_Difference->SetBinContent(1,golden_mean - proto_mean);
Ped_Difference->SetBinError(1,sqrt(pow(golden_sigma,2)+pow(proto_sigma,2)));
+ Double_t histmaxdiff = TMath::Abs(golden_mean - proto_mean)*1.2;
+ if (histmaxdiff < 15) histmaxdiff = 15;
+
//Start Drawing
gStyle->SetOptStat(0);
- Ped_Difference->SetAxisRange(-5,5,"Y");
+ Ped_Difference->SetAxisRange(-histmaxdiff,histmaxdiff,"Y");
Ped_Difference->SetMarkerStyle(8);
Ped_Difference->SetMarkerSize(1);
Ped_Difference->DrawClone("PE1");
gPad->Update();
- TLine *Lower_Limit = new TLine(gPad->GetUxmin(),-2,gPad->GetUxmax(),-2);
+ TLine *Lower_Limit = new TLine(gPad->GetUxmin(),-3.5,gPad->GetUxmax(),-3.5);
Lower_Limit->SetLineColor(kRed); Lower_Limit->SetLineWidth(3); Lower_Limit->SetLineStyle(2); Lower_Limit->Draw();
- TLine *Upper_Limit = new TLine(gPad->GetUxmin(),+2,gPad->GetUxmax(),+2);
+ TLine *Upper_Limit = new TLine(gPad->GetUxmin(),+3.5,gPad->GetUxmax(),+3.5);
Upper_Limit->SetLineColor(kRed); Upper_Limit->SetLineWidth(3); Upper_Limit->SetLineStyle(2); Upper_Limit->Draw();
Ped_Difference->~TH1D();
diff --git a/onlineGUI/onlineGUI_v1.2.1/online.C b/onlineGUI/onlineGUI_v1.2.1/online.C
index 4c21c0ef358df4fea95171064ef00bbbbbb8d986..98f86d3e3e00e22c688095ef1c0758b330693486 100755
--- a/onlineGUI/onlineGUI_v1.2.1/online.C
+++ b/onlineGUI/onlineGUI_v1.2.1/online.C
@@ -1914,38 +1914,39 @@ void OnlineGUI::PrintPages() {
if(!useJPG) fCanvas->Print(filename+"]");
//
- cout << "Writing histograms to root file '" << filename << "'." << endl;
-
- filename.Resize(filename.Last('.'));
- filename += ".root";
- TFile* hroot = new TFile(filename,"recreate");
-
- UInt_t pageCount = fConfig->GetPageCount();
- for (UInt_t iPage=0; iPage<pageCount; ++iPage) {
- UInt_t drawCount = fConfig->GetDrawCount(iPage);
- for (UInt_t iDraw=0; iDraw<drawCount; ++iDraw) {
- TString macro = fConfig->GetDrawCommand(iPage, iDraw).macro;
- if (macro != "") {
- TString histName = macro.Remove(0, macro.First('\"')+1);
- histName.Resize(macro.First('\"'));
-
- fRootFile.RootFile->cd();
- TH1F* h1f = dynamic_cast<TH1F*>(gDirectory->Get(histName));
- TH2F* h2f = dynamic_cast<TH2F*>(gDirectory->Get(histName));
- hroot->cd();
-
- if (h1f) h1f->Write();
- else if (h2f) h2f->Write();
- else cout << histName << " not found!" << endl;
- }
- }
- }
-
- hroot->Write();
- hroot->Close();
- delete hroot;
-
- cout << "Root file '" << filename << "' done." << endl;
+ // filename.Resize(filename.Last('.'));
+ // filename += ".root";
+ // TFile* hroot = new TFile(filename,"recreate");
+
+ // cout << "Writing histograms to root file '" << filename << "'." << endl;
+
+ // UInt_t pageCount = fConfig->GetPageCount();
+ // for (UInt_t iPage=0; iPage<pageCount; ++iPage) {
+ // UInt_t drawCount = fConfig->GetDrawCount(iPage);
+ // for (UInt_t iDraw=0; iDraw<drawCount; ++iDraw) {
+ // TString macro = fConfig->GetDrawCommand(iPage, iDraw).macro;
+ // if (macro != "") {
+
+ // TString histName = macro.Remove(0, macro.First('\"')+1);
+ // histName.Resize(macro.First('\"'));
+
+ // fRootFile.RootFile->cd();
+ // TH1F* h1f = dynamic_cast<TH1F*>(gDirectory->Get(histName));
+ // TH2F* h2f = dynamic_cast<TH2F*>(gDirectory->Get(histName));
+ // hroot->cd();
+
+ // if (h1f) h1f->Write();
+ // else if (h2f) h2f->Write();
+ // // else cout << histName << " not found!" << endl;
+ // }
+ // }
+ // }
+
+ // hroot->Write();
+ // hroot->Close();
+ // delete hroot;
+
+ // cout << "Root file '" << filename << "' done." << endl;
//
#ifdef STANDALONE