aboutsummaryrefslogtreecommitdiff
path: root/utils/zdab-reprocess
diff options
context:
space:
mode:
Diffstat (limited to 'utils/zdab-reprocess')
-rwxr-xr-xutils/zdab-reprocess63
1 files changed, 9 insertions, 54 deletions
diff --git a/utils/zdab-reprocess b/utils/zdab-reprocess
index 70332fa..2e3ba89 100755
--- a/utils/zdab-reprocess
+++ b/utils/zdab-reprocess
@@ -122,18 +122,6 @@ $num_events 0
* Titles and database checks.
set bank TMTT 1 word 0 to 1
-***Required for the RAA
-*Return end of file to initiate analyse/restore phases
-$return_eof $enabled
-*raa.dat must be loaded through titles as TRAA is not stored in the database.
-titles raa.dat
-* Memory is tight and we are not using the reduced buffer.
-titles raa_request_ncdcorr.dat
-*RAA buffer file location. Warning this file can be very big.
-FILE RAA 1 raa.tmp
-*Delete PMT style banks before storing data in the buffer. Reduces buffer size.
-$raa_delete_pmts $yes
-
* HCA Control.
$hca_mode $perform_correction
$hca_correction $new_correction
@@ -150,18 +138,11 @@ titles mpca_data.dat
* Turn on the channel dependent gain calibration
set bank TCAL 1 word 4 to 54
-*FTI
-* FTI titles files are not in the database yet
-*Load FTI angular PDF titles file
-titles fti_ang_pdfs.dat
-
*Load charge probability titles file
titles charge_photoelectrons.dat
-titles fitter_fti.dat
-
* Low nhit prescale
-$flt_set_prescale_2 0.01
+$flt_set_prescale_2 0.0
* Primary NHIT Cut.
$enable_test 1
@@ -185,57 +166,29 @@ $define_test 9 $line_1 'one equals 1.0;'
define event_loop
call INP
- if_eof goto EOF
call UPK
call CAL
- call RAA($raa_hca,$raa_qrc,$raa_ncd_corr_tag)
- quit_event
-EOF:
- call RAA
call FLT($PERM_BANK_CUT)
if_not_ok goto WRITE_OUT
- call UPK
EVENT_REJECT:
call FLT(9) * User defined cut. Default passes all.
if_not_ok quit_event
call FLT($JUNK_CUT) * Junk. We still want to keep NCD events.
- if_not_ok goto JUNK_SELECT:
+ if_not_ok quit_event
call FLT(1) * Primary NHIT Cut.
if_ok goto FITTERS
- call FLT(4) * NCD Cut.
- if_ok goto FITTERS
call FLT($PRESCALE_2_TAG)
if_ok goto FITTERS
- quit_event
-
-JUNK_SELECT:
- call FLT(4) * NCD Cut.
- if_ok goto WRITE_OUT
- quit_event
+ goto WRITE_OUT
FITTERS:
- call CAL
call FLT($ITC_CUT)
if_not_ok goto WRITE_OUT
- call FLT(21)
- if_not_ok goto XFTU
- call FTN
-XFTU:
- call FTU
call FTT
call FTQ
call FTP
- call FTG
-
-SKIP_FITTERS:
- call FLT(5)
- if_not_ok goto WRITE_OUT
- call FTR
- call FTM
- call FTI
- call FTY
- call FTZ
+ call RSP($KFT_FTP)
WRITE_OUT:
call PRU
@@ -349,6 +302,8 @@ if __name__ == '__main__':
parser.add_argument("filenames", nargs="+", help="filenames of zdabs")
parser.add_argument("--dir", default=None, help="directory to store reprocessed zdab files")
parser.add_argument("--min-nhit", type=int, default=None, help="minimum nhit value")
+ parser.add_argument("--lower-nhit", type=float, default=18.5, help="lower value for primary nhit cut")
+ parser.add_argument("--upper-nhit", type=float, default=9999, help="upper value for primary nhit cut")
parser.add_argument("--suffix", default="reprocessed", help="suffix appended to output filename")
args = parser.parse_args()
@@ -401,9 +356,9 @@ if __name__ == '__main__':
anxx_neutrino=anxx_neutrino_filename,
anxx_pca=anxx_pca_filename,
settings_file=GetSettingsFile(run),
- prescale_setting=1.0,
- lower_nhit = 18.5,
- upper_nhit = 9999.0,
+ prescale_setting=1.0, # no idea what this is
+ lower_nhit = args.lower_nhit,
+ upper_nhit = args.upper_nhit,
seed=0,
seed2=0,
clock_force_no_fix=get_clock_force_no_fix_string(run),