Merge pull request #336 from sawatzky/realPrescaleFactors

Expose actual prescale factors in report files

.gitignore

@@ -8,6 +8,7 @@ bck/*
 *#*
 hcana
 raw
+cache
 .root_history
 HISTOGRAMS/*
 REPORT_OUTPUT
@@ -32,4 +33,4 @@ CALIBRATION/shms_dc_calib/data_files/
 onlineGUI/onlineGUI_v1.2.1/onlineDict_rdict.pcm
 .nfs*
 raw.copiedtotape
-HISTOGRAMS
\ No newline at end of file
+HISTOGRAMS

TEMPLATES/HMS/PRODUCTION/hstackana_production.template

@@ -36,19 +36,12 @@ Chamber 2: {hdc_zpos[6]:%6.2f} {hdc_zpos[7]:%6.2f} {hdc_zpos[8]:%6.2f}
 * DAQ Configuration
 ********************
 
-Ps1_value = {ghconfig_ti_ps[0]}
-Ps2_value = {ghconfig_ti_ps[1]}
-Ps3_value = {ghconfig_ti_ps[2]}
-Ps4_value = {ghconfig_ti_ps[3]}
-Ps5_value = {ghconfig_ti_ps[4]}
-Ps6_value = {ghconfig_ti_ps[5]}
-
-Ps1_factor = {floor(2**(ghconfig_ti_ps[0] - 1) + 1):%d}
-Ps2_factor = {floor(2**(ghconfig_ti_ps[1] - 1) + 1):%d}
-Ps3_factor = {floor(2**(ghconfig_ti_ps[2] - 1) + 1):%d}
-Ps4_factor = {floor(2**(ghconfig_ti_ps[3] - 1) + 1):%d}
-Ps5_factor = {floor(2**(ghconfig_ti_ps[4] - 1) + 1):%d}
-Ps6_factor = {floor(2**(ghconfig_ti_ps[5] - 1) + 1):%d}
+Ps1_factor = {ghconfig_ti_ps_factors[0]}
+Ps2_factor = {ghconfig_ti_ps_factors[1]}
+Ps3_factor = {ghconfig_ti_ps_factors[2]}
+Ps4_factor = {ghconfig_ti_ps_factors[3]}
+Ps5_factor = {ghconfig_ti_ps_factors[4]}
+Ps6_factor = {ghconfig_ti_ps_factors[5]}
 
 ***************
 * 3/4 Triggers

TEMPLATES/HMS/SCALERS/hscalers.template

@@ -28,19 +28,12 @@ Unser Counts: {H.Unser.scalerCut} 	Total Charge: {H.Unser.scalerChargeCut:%.3f}
 * DAQ Configuration
 ********************
 
-Ps1_value = {ghconfig_ti_ps[0]}
-Ps2_value = {ghconfig_ti_ps[1]}
-Ps3_value = {ghconfig_ti_ps[2]}
-Ps4_value = {ghconfig_ti_ps[3]}
-Ps5_value = {ghconfig_ti_ps[4]}
-Ps6_value = {ghconfig_ti_ps[5]}
-
-Ps1_factor = {floor(2**(ghconfig_ti_ps[0] - 1) + 1):%d}
-Ps2_factor = {floor(2**(ghconfig_ti_ps[1] - 1) + 1):%d}
-Ps3_factor = {floor(2**(ghconfig_ti_ps[2] - 1) + 1):%d}
-Ps4_factor = {floor(2**(ghconfig_ti_ps[3] - 1) + 1):%d}
-Ps5_factor = {floor(2**(ghconfig_ti_ps[4] - 1) + 1):%d}
-Ps6_factor = {floor(2**(ghconfig_ti_ps[5] - 1) + 1):%d}
+Ps1_factor = {ghconfig_ti_ps_factors[0]}
+Ps2_factor = {ghconfig_ti_ps_factors[1]}
+Ps3_factor = {ghconfig_ti_ps_factors[2]}
+Ps4_factor = {ghconfig_ti_ps_factors[3]}
+Ps5_factor = {ghconfig_ti_ps_factors[4]}
+Ps6_factor = {ghconfig_ti_ps_factors[5]}
 
 ***********
 * Triggers
@@ -200,4 +193,4 @@ H2X: {H.S2X.scaler} [ {H.S2X.scalerRate/1000.:%.3f} kHz ] AND between + and - si
 H2Y: {H.S2Y.scaler} [ {H.S2Y.scalerRate/1000.:%.3f} kHz ] AND between + and - sides of H2Y
 
 H1XH1Y: {H.S1XS1Y.scaler} [{H.S1XS1Y.scalerRate/1000.:%.3f}] AND between H1X and H1Y planes 
-H2XH2Y: {H.S2XS2Y.scaler} [{H.S2XS2Y.scalerRate/1000.:%.3f}] OR between H2X and H2Y planes (just for kpp, will be AND)
\ No newline at end of file
+H2XH2Y: {H.S2XS2Y.scaler} [{H.S2XS2Y.scalerRate/1000.:%.3f}] OR between H2X and H2Y planes (just for kpp, will be AND)

TEMPLATES/SHMS/PRODUCTION/pstackana_production.template

@@ -25,19 +25,12 @@ Unser Counts: {P.Unser.scalerCut} 	Total Charge: {P.Unser.scalerChargeCut:%.3f}
 * DAQ Configuration
 ********************
 
-Ps1_value = {gpconfig_ti_ps[0]}
-Ps2_value = {gpconfig_ti_ps[1]}
-Ps3_value = {gpconfig_ti_ps[2]}
-Ps4_value = {gpconfig_ti_ps[3]}
-Ps5_value = {gpconfig_ti_ps[4]}
-Ps6_value = {gpconfig_ti_ps[5]}
-
-Ps1_factor = {floor(2**(gpconfig_ti_ps[0] - 1) + 1):%d}
-Ps2_factor = {floor(2**(gpconfig_ti_ps[1] - 1) + 1):%d}
-Ps3_factor = {floor(2**(gpconfig_ti_ps[2] - 1) + 1):%d}
-Ps4_factor = {floor(2**(gpconfig_ti_ps[3] - 1) + 1):%d}
-Ps5_factor = {floor(2**(gpconfig_ti_ps[4] - 1) + 1):%d}
-Ps6_factor = {floor(2**(gpconfig_ti_ps[5] - 1) + 1):%d}
+Ps1_factor = {ghconfig_ti_ps_factors[0]}
+Ps2_factor = {ghconfig_ti_ps_factors[1]}
+Ps3_factor = {ghconfig_ti_ps_factors[2]}
+Ps4_factor = {ghconfig_ti_ps_factors[3]}
+Ps5_factor = {ghconfig_ti_ps_factors[4]}
+Ps6_factor = {ghconfig_ti_ps_factors[5]}
 
 ***************	
 * 3/4 Triggers 

TEMPLATES/SHMS/SCALERS/pscalers.template

@@ -29,19 +29,12 @@ Unser Counts: {P.Unser.scalerCut} 	Total Charge: {P.Unser.scalerChargeCut:%.3f}
 * DAQ Configuration
 ********************
 
-Ps1_value = {gpconfig_ti_ps[0]}
-Ps2_value = {gpconfig_ti_ps[1]}
-Ps3_value = {gpconfig_ti_ps[2]}
-Ps4_value = {gpconfig_ti_ps[3]}
-Ps5_value = {gpconfig_ti_ps[4]}
-Ps6_value = {gpconfig_ti_ps[5]}
-
-Ps1_factor = {floor(2**(gpconfig_ti_ps[0] - 1) + 1):%d}
-Ps2_factor = {floor(2**(gpconfig_ti_ps[1] - 1) + 1):%d}
-Ps3_factor = {floor(2**(gpconfig_ti_ps[2] - 1) + 1):%d}
-Ps4_factor = {floor(2**(gpconfig_ti_ps[3] - 1) + 1):%d}
-Ps5_factor = {floor(2**(gpconfig_ti_ps[4] - 1) + 1):%d}
-Ps6_factor = {floor(2**(gpconfig_ti_ps[5] - 1) + 1):%d}
+Ps1_factor = {ghconfig_ti_ps_factors[0]}
+Ps2_factor = {ghconfig_ti_ps_factors[1]}
+Ps3_factor = {ghconfig_ti_ps_factors[2]}
+Ps4_factor = {ghconfig_ti_ps_factors[3]}
+Ps5_factor = {ghconfig_ti_ps_factors[4]}
+Ps6_factor = {ghconfig_ti_ps_factors[5]}
 
 ***********	
 * 3/4 Triggers