Merge pull request #150 from MarkKJones/template-update

Modify TEMPLATES/pstackana.template

TEMPLATES/pstackana.template

@@ -8,8 +8,21 @@ Chamber 1: {pdc_zpos[0]:%6.2f} {pdc_zpos[1]:%6.2f} {pdc_zpos[2]:%6.2f}
 Chamber 2: {pdc_zpos[6]:%6.2f} {pdc_zpos[7]:%6.2f} {pdc_zpos[8]:%6.2f} 
            {pdc_zpos[9]:%6.2f} {pdc_zpos[10]:%6.2f} {pdc_zpos[11]:%6.2f}
 
+
+Run Time: {PS1Mhz}  {PS1Mhz/1000000.} sec
+BCM1  : {(PSBCM1r-250000)/(4673)} uA     Total charge = {(PSBCM1r-250000)/(4673)*PS1Mhz/1000000.} uC
+BCM2  : {(PSBCM2r-250000)/(3954)} uA          Total charge = {(PSBCM2r-250000)/(3954)*PS1Mhz/1000000.} uC 
+Unser : {(PSUnserr-393000)/(4000)} uA         Total charge = {(PSUnserr-393000)/(4000)*PS1Mhz/1000000.} uC
+
 All triggers:  {all_trigs.npassed}
 
+good_S1_time         Counts: {good_S1_time.npassed}     /all_trigs :  {good_S1_time.npassed/all_trigs.npassed}       
+good_S2X_time        Counts: {good_S2X_time.npassed}    /all_trigs :  {good_S2X_time.npassed/all_trigs.npassed}    
+good_S1_S2X_time     Counts: {good_S1_S2X_time.npassed} /all_trigs :  {good_S1_S2X_time.npassed/all_trigs.npassed}
+
+
+
+
 Chamber 1 hits > 0                   Counts: {shms_ch1_gt0.npassed} /all_trigs : {shms_ch1_gt0.npassed/all_trigs.npassed}         
 Chamber 2 hits > 0                   Counts: {shms_ch2_gt0.npassed} /all_trigs : { shms_ch2_gt0.npassed/all_trigs.npassed}        
 Chamber 2 hits > 0 & Ch 1 hits =0    Counts: {shms_ch2_gt0_noch1.npassed} /all_trigs : { shms_ch2_gt0_noch1.npassed/all_trigs.npassed}  
@@ -20,6 +33,19 @@ Ch 1 hits > 0 &Ch 2 hits > 0 & track         Counts: {shms_ch_gt0_track.npassed}
  Chamber 1 > 3 & Ch 2 hits > 3                 Counts: {shms_ch_gt4.npassed} /all_trigs : { shms_ch_gt4.npassed/all_trigs.npassed}        
 Ch 1 hits > 3 &Ch 2 hits > 3 & track         Counts: {shms_ch_gt4_track.npassed} /all_trigs : { shms_ch_gt4_track.npassed/all_trigs.npassed}
 
+
+Add cut on good_S1_S2X_time 
+
+Chamber 1 hits > 0                   Counts: {shms_ch1_gt0_gtime.npassed} /all_trigs : {shms_ch1_gt0_gtime.npassed/all_trigs.npassed}         
+Chamber 2 hits > 0                   Counts: {shms_ch2_gt0_gtime.npassed} /all_trigs : { shms_ch2_gt0_gtime.npassed/all_trigs.npassed}        
+Chamber 2 hits > 0 & Ch 1 hits =0    Counts: {shms_ch2_gt0_noch1_gtime.npassed} /all_trigs : { shms_ch2_gt0_noch1_gtime.npassed/all_trigs.npassed}  
+Chamber 1 hits > 0 & Ch 2 hits =0    Counts: {shms_ch1_gt0_noch2_gtime.npassed} /all_trigs : {shms_ch1_gt0_noch2_gtime.npassed/all_trigs.npassed}  
+Chamber 1 hits=0 & Ch 2 hits =0    Counts: {shms_noch1_noch2_gtime.npassed} /all_trigs : {shms_noch1_noch2_gtime.npassed/all_trigs.npassed}  
+Chamber 1 > 0 & Ch 2 hits > 0                 Counts: {shms_ch_gt0_gtime.npassed} /all_trigs : { shms_ch_gt0_gtime.npassed/all_trigs.npassed}        
+Ch 1 hits > 0 &Ch 2 hits > 0 & track         Counts: {shms_ch_gt0_track_gtime.npassed} /all_trigs : { shms_ch_gt0_track_gtime.npassed/all_trigs.npassed}
+ Chamber 1 > 3 & Ch 2 hits > 3                 Counts: {shms_ch_gt4_gtime.npassed} /all_trigs : { shms_ch_gt4_gtime.npassed/all_trigs.npassed}        
+Ch 1 hits > 3 &Ch 2 hits > 3 & track         Counts: {shms_ch_gt4_track_gtime.npassed} /all_trigs : { shms_ch_gt4_track_gtime.npassed/all_trigs.npassed}
+
 shmsDC1Planes_large  Counts:  {shmsDC1Planes_large.npassed} /all_trigs : {shmsDC1Planes_large.npassed/all_trigs.npassed}
 shmsDC2Planes_large  Counts:	  {shmsDC2Planes_large.npassed}  /all_trigs : {shmsDC2Planes_large.npassed/all_trigs.npassed}