diff --git a/CALIBRATION/shms_hodo_calib/README.md b/CALIBRATION/shms_hodo_calib/README.md
index eaccc68c06420551b0df40f5c5fedf4e781e064e..0084c144bbd865e3afd1ff7c0e2b382f96d5bb58 100644
--- a/CALIBRATION/shms_hodo_calib/README.md
+++ b/CALIBRATION/shms_hodo_calib/README.md
@@ -12,10 +12,13 @@ The two codes have different parameters and it is possible to switch between the
## Instructions
1. Replay the data with ptofusinginvadc=0 and need to have T.* and P.hod.* in the tree.
+ Go to: PARAM/SHMS/GEN/p_fadc_debug.param, and set phodo_debug_adc = 1 ---> Use the correct hodo raw leafs variables
+
+(In case you are calibrating SHMS hodo using a coincidence run, then make sure to include T.coin.*)
2. Determine the time walk correction parameters
- a. Start "root -l" and then .x timeWalkHistos.C+("entire_root_filename",runnumber)
+ a. Start "root -l" and then .x timeWalkHistos.C+("current_dir/to/ROOT_filename.root",Run_Number, "shms") ---> If doing coincidence, then "shms"->"coin"
b. This creats the file: timeWalkHistos.root
@@ -28,12 +31,12 @@ The two codes have different parameters and it is possible to switch between the
4. Determine the the effective propagation speeed in the paddle, the time difference between the positive and negative PMTs and then the relative time difference of all paddles compared to paddle 7 in plane S1X. The script
puts cuts on P.cal.etracknorm, P.hgcer.npeSum and P.hod.betanotrack to select electrons. These cuts are hard coded as etrknrm_low_cut = 0.7, npngcer_npeSum_low_cut = 0.7 , betanotrack_low_cut = 0.5 and betanotrack_hi_cut = 1.5. These may need to be modified. The event must have a track.
- a. Start "root -l" and then .x fitHodoCalib.C+("entire_root_filename",runnumber)
+ a. Start "root -l" and then .x fitHodoCalib.C+("current_dir/to/ROOT_filename.root",Run_Number)
b. This creates the parameter file "../../PARAM/SHMS/HODO/phodo_Vpcalib_runnumber.param"
c. It also creates the root file HodoCalibPlots_runnumber.root
- d. To analyze cosmic data : .x fitHodoCalib.C+("entire_root_filename",runnumber,kTRUE)
+ d. To analyze cosmic data : .x fitHodoCalib.C+("current_dir/to/ROOT_filename.root",Run_Number,kTRUE)
- e. For csomic data the spped of light is set to -30 cm/ns and the PID cut is just on P.hod.betanotrack with the default of betanotrack_low_cut = -1.2 and betanotrack_hi_cut = -.7
+ e. For cosmic data the speed of light is set to -30 cm/ns and the PID cut is just on P.hod.betanotrack with the default of betanotrack_low_cut = -1.2 and betanotrack_hi_cut = -.7
diff --git a/CALIBRATION/shms_hodo_calib/fitHodoCalib.C b/CALIBRATION/shms_hodo_calib/fitHodoCalib.C
index 234342f073bb85574812ec2d51c0a58c47c4d659..4208f9841f8a03038eaf9aa8cd1ca9903650069b 100644
--- a/CALIBRATION/shms_hodo_calib/fitHodoCalib.C
+++ b/CALIBRATION/shms_hodo_calib/fitHodoCalib.C
@@ -649,7 +649,7 @@ void fitHodoCalib(TString filename,Int_t runNUM,Bool_t cosmic_flag=kFALSE)
outPARAM << "; SHMS Hodoscope Parameter File Containing propagation velocities per paddle " << endl;
outPARAM << "; and signal cable time diff. offsets per paddle " << endl;
- outPARAM << " " << endl;
+ outPARAM << Form("; Run %d ", runNUM) << endl;
outPARAM << " " << endl;
outPARAM << " " << endl;
diff --git a/CALIBRATION/shms_hodo_calib/timeWalkCalib.C b/CALIBRATION/shms_hodo_calib/timeWalkCalib.C
index 8160eb77196f1d1a7ea5d1553c6924b110528ab7..dd0b63378850ec4d89ef49e171cfda1a9a131785 100644
--- a/CALIBRATION/shms_hodo_calib/timeWalkCalib.C
+++ b/CALIBRATION/shms_hodo_calib/timeWalkCalib.C
@@ -273,10 +273,9 @@ void WriteFitParam(int runNUM)
TString outPar_Name = Form("../../PARAM/SHMS/HODO/phodo_TWcalib_%d.param", runNUM);
outParam.open(outPar_Name);
- outParam << ";SHMS Hodoscopes Time Walk Output Parameter File" << endl;
+ outParam << Form(";SHMS Hodoscopes Time Walk Output Parameter File: Run %d", runNUM) << endl;
outParam << " " << endl;
outParam << "pTDC_threshold=" << tdcThresh << " ;units of mV" <<endl;
- //outPARAM << "ptofusinginvadc=0" << endl; //set to zero to NOT use old hodo parameters
outParam << " " << endl;
//Fill 3D Par array
diff --git a/CALIBRATION/shms_hodo_calib/timeWalkHistos.C b/CALIBRATION/shms_hodo_calib/timeWalkHistos.C
index 46c7397b46fda98a3b0c8a1f2fd15eac16248ee8..1ce353738724bf1e97d7c697d47c34efabbbd150 100644
--- a/CALIBRATION/shms_hodo_calib/timeWalkHistos.C
+++ b/CALIBRATION/shms_hodo_calib/timeWalkHistos.C
@@ -198,7 +198,7 @@ void generatePlots(UInt_t iplane, UInt_t iside, UInt_t ipaddle) {
} // generatePlots()
-void timeWalkHistos(TString inputname, Int_t runNum) {
+void timeWalkHistos(TString inputname, Int_t runNum, string SPEC_flg) { //SPEC_flg--> "shms" or "coin"
// Global ROOT settings
gStyle->SetOptFit();
@@ -227,12 +227,12 @@ void timeWalkHistos(TString inputname, Int_t runNum) {
Double_t phod_2ynhits;
// Acquire the trigger apparatus data
- rawDataTree->SetBranchAddress("T.shms.pFADC_TREF_ROC2_adcPulseTimeRaw", &refAdcPulseTimeRaw);
- rawDataTree->SetBranchAddress("T.shms.pFADC_TREF_ROC2_adcPulseAmp", &refAdcPulseAmp);
- rawDataTree->SetBranchAddress("T.shms.pFADC_TREF_ROC2_adcMultiplicity", &refAdcMultiplicity);
- rawDataTree->SetBranchAddress("T.shms.pT1_tdcTimeRaw", &refT1TdcTimeRaw);
- rawDataTree->SetBranchAddress("T.shms.pT2_tdcTimeRaw", &refT2TdcTimeRaw);
- rawDataTree->SetBranchAddress("T.shms.pT3_tdcTimeRaw", &refT3TdcTimeRaw);
+ rawDataTree->SetBranchAddress(Form("T.%s.pFADC_TREF_ROC2_adcPulseTimeRaw", SPEC_flg.c_str()), &refAdcPulseTimeRaw);
+ rawDataTree->SetBranchAddress(Form("T.%s.pFADC_TREF_ROC2_adcPulseAmp", SPEC_flg.c_str()), &refAdcPulseAmp);
+ rawDataTree->SetBranchAddress(Form("T.%s.pFADC_TREF_ROC2_adcMultiplicity", SPEC_flg.c_str()), &refAdcMultiplicity);
+ rawDataTree->SetBranchAddress(Form("T.%s.pT1_tdcTimeRaw", SPEC_flg.c_str()), &refT1TdcTimeRaw);
+ rawDataTree->SetBranchAddress(Form("T.%s.pT2_tdcTimeRaw", SPEC_flg.c_str()), &refT2TdcTimeRaw);
+ rawDataTree->SetBranchAddress(Form("T.%s.pT3_tdcTimeRaw", SPEC_flg.c_str()), &refT3TdcTimeRaw);
// rawDataTree->SetBranchAddress("P.cal.etot", &calEtot);
// rawDataTree->SetBranchAddress("P.ngcer.npeSum", &cerNpeSum);