diff --git a/DEF-files/SHMS/AERO/paeroana.def b/DEF-files/SHMS/AERO/paeroana.def index 645a764da6d7480565461126ed8ebde09a5cc988..876c918bdc3c132c67580813067c4e8b8bcaa23b 100644 --- a/DEF-files/SHMS/AERO/paeroana.def +++ b/DEF-files/SHMS/AERO/paeroana.def @@ -4,9 +4,8 @@ block P.aero.* block T.shms.* #SHMS AERO FPGA Error Flag -TH1F paero_adcErrFlg_pos 'SHMS Aero+ FPGA Error Flag; Error Flag; Number of Entries' P.aero.posAdcErrorFlag 2 -0.5 1.5 -TH1F paero_adcErrFlg_neg 'SHMS Aero- FPGA Error Flag; Error Flag; Number of Entries' P.aero.negAdcErrorFlag 2 -0.5 1.5 - +TH2F paero_adcErrFlg2D_pos 'SHMS Aero+ FPGA Error Flag; PMT Number; Error Flag' P.aero.posAdcCounter P.aero.posAdcErrorFlag 7 0.5 7.5 2 -0.5 1.5 +TH2F paero_adcErrFlg2D_neg 'SHMS Aero- FPGA Error Flag; PMT Number; Error Flag' P.aero.negAdcCounter P.aero.negAdcErrorFlag 7 0.5 7.5 2 -0.5 1.5 #SHMS AERO RAW Occupancy and Multiplicity TH1F paero_raw_occ_pos 'SHMS Aero+ Raw Occupancy; PMT Number; Number of Raw +ADC Hits' P.aero.posAdcCounter 7 0.5 7.5 diff --git a/DEF-files/SHMS/CAL/pcalana.def b/DEF-files/SHMS/CAL/pcalana.def index d8e28322251649f2d87dee927dbac1c9a7c075c8..cc9b8e6a835d683a5cb58172a3dbfc080a246a70 100644 --- a/DEF-files/SHMS/CAL/pcalana.def +++ b/DEF-files/SHMS/CAL/pcalana.def @@ -6,8 +6,12 @@ block T.shms.* #SHMS PRE-SHOWER HISTOGRAMS #SHMS PreSH FPGA Error Flags -TH1F pcal_prshwr_adcErrFlg_pos 'SHMS PreShower+ FPGA Error Flag; Error Flag; Number of Entries' P.cal.pr.posAdcErrorFlag 2 -0.5 1.5 -TH1F pcal_prshwr_adcErrFlg_neg 'SHMS PreShower- FPGA Error Flag; Error Flag; Number of Entries' P.cal.pr.negAdcErrorFlag 2 -0.5 1.5 +#TH1F pcal_prshwr_adcErrFlg_pos 'SHMS PreShower+ FPGA Error Flag; Error Flag; Number of Entries' P.cal.pr.posAdcErrorFlag 2 -0.5 1.5 +#TH1F pcal_prshwr_adcErrFlg_neg 'SHMS PreShower- FPGA Error Flag; Error Flag; Number of Entries' P.cal.pr.negAdcErrorFlag 2 -0.5 1.5 + +TH2F pcal_prshwr_adcErrFlg2D_pos 'SHMS PreShower+ FPGA Error Flag; PMT Number; Error Flag' P.cal.pr.posAdcCounter P.cal.pr.posAdcErrorFlag 14 0.5 14.5 2 -0.5 1.5 +TH2F pcal_prshwr_adcErrFlg2D_neg 'SHMS PreShower- FPGA Error Flag; PMT Number; Error Flag' P.cal.pr.negAdcCounter P.cal.pr.negAdcErrorFlag 14 0.5 14.5 2 -0.5 1.5 + #SHMS PreSH RAW Occupancy and Multiplicity TH1F pcal_prshwr_raw_occ_pos 'SHMS PreShower+ Raw Occupancy; PMT Number; Number of Raw +ADC Hits' P.cal.pr.posAdcCounter 14 0.5 14.5 @@ -76,7 +80,7 @@ TH1F pcal_prshwr_Eplane 'SHMS PreShower Total Energy Deposition; Total Energy De #SHMS SHOWER HISTOGRAMS #SHMS Shower FPGA Error Flags -TH1F pcal_shwr_adcErrFlg_pos 'SHMS Shower FPGA Error Flag; Error Flag; Number of Entries' P.cal.fly.adcErrorFlag 2 -0.5 1.5 +TH2F pcal_shwr_adcErrFlg2D_pos 'SHMS Shower FPGA Error Flag; PMT Number; Error Flag' P.cal.fly.adcCounter P.cal.fly.adcErrorFlag 224 0.5 224.5 2 -0.5 1.5 #SHMS Shower RAW Occupancy and Multiplicity TH1F pcal_shwr_raw_occ 'SHMS Shower Raw Occupancy; PMT Number; Number of Raw ADC Hits' P.cal.fly.adcCounter 224 0.5 224.5 diff --git a/DEF-files/SHMS/HGCER/phgcerana.def b/DEF-files/SHMS/HGCER/phgcerana.def index f455c5edd7739ad44a17d70874fc0335de055624..f9041490d57b6ac6e01b5ae3763822809118e819 100644 --- a/DEF-files/SHMS/HGCER/phgcerana.def +++ b/DEF-files/SHMS/HGCER/phgcerana.def @@ -4,7 +4,7 @@ block P.hgcer.* block T.shms.* #SHMS FPGA Error Flag -TH1F phgcer_adcErrFlg 'SHMS Heavy Gas Cherenkov FPGA Error Flag; Error Flag; Number of Entries' P.hgcer.adcErrorFlag 2 -0.5 1.5 +TH2F phgcer_adcErrFlg2D 'SHMS Heavy Gas Cherenkov FPGA Error Flag; PMT Number; Error Flag' P.hgcer.adcCounter P.hgcer.adcErrorFlag 4 0.5 4.5 2 -0.5 1.5 #SHMS HGC RAW Occupancy and Multiplicity TH1F phgcer_raw_occ 'SHMS Heavy Gas Cherenkov Raw Occupancy; PMT Number; Number of Raw ADC Hits' P.hgcer.adcCounter 4 0.5 4.5 diff --git a/DEF-files/SHMS/HODO/phodoana.def b/DEF-files/SHMS/HODO/phodoana.def index e09500bda49831e03ba0008bc9b3a5c9cf173319..1b54589113371afa83b6acd83e1030c9e4b0f69a 100644 --- a/DEF-files/SHMS/HODO/phodoana.def +++ b/DEF-files/SHMS/HODO/phodoana.def @@ -4,16 +4,15 @@ block P.hod.* block T.shms.* #SHMS Hodo Error Flags -TH1F phodo_1x_pos_adcErrFlg 'SHMS 1X+ FPGA Error Flag; Error Flag; Number of Entries' P.hod.1x.posAdcErrorFlag 2 -0.5 1.5 -TH1F phodo_1y_pos_adcErrFlg 'SHMS 1Y+ FPGA Error Flag; Error Flag; Number of Entries' P.hod.1y.posAdcErrorFlag 2 -0.5 1.5 -TH1F phodo_2x_pos_adcErrFlg 'SHMS 2X+ FPGA Error Flag; Error Flag; Number of Entries' P.hod.2x.posAdcErrorFlag 2 -0.5 1.5 -TH1F phodo_2y_pos_adcErrFlg 'SHMS 2Y+ FPGA Error Flag; Error Flag; Number of Entries' P.hod.2y.posAdcErrorFlag 2 -0.5 1.5 - -TH1F phodo_1x_neg_adcErrFlg 'SHMS 1X- FPGA Error Flag; Error Flag; Number of Entries' P.hod.1x.negAdcErrorFlag 2 -0.5 1.5 -TH1F phodo_1y_neg_adcErrFlg 'SHMS 1Y- FPGA Error Flag; Error Flag; Number of Entries' P.hod.1y.negAdcErrorFlag 2 -0.5 1.5 -TH1F phodo_2x_neg_adcErrFlg 'SHMS 2X- FPGA Error Flag; Error Flag; Number of Entries' P.hod.2x.negAdcErrorFlag 2 -0.5 1.5 -TH1F phodo_2y_neg_adcErrFlg 'SHMS 2Y- FPGA Error Flag; Error Flag; Number of Entries' P.hod.2y.negAdcErrorFlag 2 -0.5 1.5 - +TH2F phodo_1x_pos_adcErrFlg2D 'SHMS 1X+ FPGA Error Flag; PMT Number; Error Flag' P.hod.1x.posAdcCounter P.hod.1x.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5 +TH2F phodo_1y_pos_adcErrFlg2D 'SHMS 1Y+ FPGA Error Flag; PMT Number; Error Flag' P.hod.1y.posAdcCounter P.hod.1y.posAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5 +TH2F phodo_2x_pos_adcErrFlg2D 'SHMS 2X+ FPGA Error Flag; PMT Number; Error Flag' P.hod.2x.posAdcCounter P.hod.2x.posAdcErrorFlag 14 0.5 14.5 2 -0.5 1.5 +TH2F phodo_2y_pos_adcErrFlg2D 'SHMS 2Y+ FPGA Error Flag; PMT Number; Error Flag' P.hod.2y.posAdcCounter P.hod.2y.posAdcErrorFlag 21 0.5 21.5 2 -0.5 1.5 + +TH2F phodo_1x_neg_adcErrFlg2D 'SHMS 1X- FPGA Error Flag; PMT Number; Error Flag' P.hod.1x.negAdcCounter P.hod.1x.negAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5 +TH2F phodo_1y_neg_adcErrFlg2D 'SHMS 1Y- FPGA Error Flag; PMT Number; Error Flag' P.hod.1y.negAdcCounter P.hod.1y.negAdcErrorFlag 13 0.5 13.5 2 -0.5 1.5 +TH2F phodo_2x_neg_adcErrFlg2D 'SHMS 2X- FPGA Error Flag; PMT Number; Error Flag' P.hod.2x.negAdcCounter P.hod.2x.negAdcErrorFlag 14 0.5 14.5 2 -0.5 1.5 +TH2F phodo_2y_neg_adcErrFlg2D 'SHMS 2Y- FPGA Error Flag; PMT Number; Error Flag' P.hod.2y.negAdcCounter P.hod.2y.negAdcErrorFlag 21 0.5 21.5 2 -0.5 1.5 #SHMS Hodo Raw ADC Multiplicities TH1F phodo_1x_raw_adc_mult_pos 'SHMS 1X+ Raw ADC Multiplicity; Number of PMTs Hit; Total Number of Raw +ADC Hits' P.hod.1x.totNumPosAdcHits 13 0.5 13.5 diff --git a/DEF-files/SHMS/NGCER/pngcerana.def b/DEF-files/SHMS/NGCER/pngcerana.def index 78e4275c3a6d15e9f1ed27a29ffb818df3c14600..8a3b7ce4304907da8df34e7ab2de76362669b991 100644 --- a/DEF-files/SHMS/NGCER/pngcerana.def +++ b/DEF-files/SHMS/NGCER/pngcerana.def @@ -4,7 +4,8 @@ block P.ngcer.* block T.shms.* #SHMS FPGA Error Flag -TH1F pngcer_adcErrFlg 'SHMS Noble Gas Cherenkov FPGA Error Flag; Error Flag; Number of Entries' P.ngcer.adcErrorFlag 2 -0.5 1.5 +#TH1F pngcer_adcErrFlg 'SHMS Noble Gas Cherenkov FPGA Error Flag; Error Flag; Number of Entries' P.ngcer.adcErrorFlag 2 -0.5 1.5 +TH2F pngcer_adcErrFlg2D 'SHMS Noble Gas Cherenkov FPGA Error Flag; PMT Number; Error Flag' P.ngcer.adcCounter P.ngcer.adcErrorFlag 4 0.5 4.5 2 -0.5 1.5 #SHMS NGC RAW Occupancy and Multiplicity TH1F pngcer_raw_occ 'SHMS Noble Gas Cherenkov Raw Occupancy; PMT Number; Number of Raw ADC Hits' P.ngcer.adcCounter 4 0.5 4.5