diff --git a/tools/nnlojet/nnlojet-combine.py b/tools/nnlojet/nnlojet-combine.py index a770c0519983bb16fe8398a8c36fd51f6967d2a1..b24552fd2ff35fa3000d39c81a26e84ef141ced1 100755 --- a/tools/nnlojet/nnlojet-combine.py +++ b/tools/nnlojet/nnlojet-combine.py @@ -91,7 +91,7 @@ def process_parts_queue(parts_queue): parts_queue.task_done() -def read_weights(wgt_file): +def read_APPLfast(wgt_file): with open(wgt_file, 'rt') as file: hist_acc = NNLOJETHistogram() nx = 0 @@ -146,9 +146,9 @@ def main(): # multi-process parser.add_argument('-j', '--jobs', type=int, nargs='?', action='store', default='1', help='Specifies the number of jobs to run simultaneously.') - # read in weights weight table - parser.add_argument('--weights', action='store', default=None, - help='Read in a weight table and combine.') + # read in APPLfast weight table + parser.add_argument('--APPLfast', action='store', default=None, + help='Read in an APPLfast weight table and combine.') # Parse the input arguments! args = parser.parse_args() @@ -156,10 +156,10 @@ def main(): config.optionxform = lambda option: option # do not convert to lower case config.read(args.config) - # read in weight table? - wgt_file = args.weights + # read in APPLfast weight table? + wgt_file = args.APPLfast if wgt_file is not None: - read_weights(wgt_file) + read_APPLfast(wgt_file) return cross_pattern = re.compile(r'.*cross.*') @@ -455,8 +455,8 @@ def main(): hist.write_to_file(outfile) # write to the file if qweights: - with open(outdir_final + '/' + fin + '.' + obs_out + '.weights.txt', 'wt') as fout: - print(hist.to_weights(), file=fout) + with open(outdir_final + '/' + fin + '.' + obs_out + '.APPLfast.txt', 'wt') as fout: + print(hist.to_APPLfast_weight(), file=fout) if __name__ == "__main__": diff --git a/tools/nnlojet/nnlojet_util.py b/tools/nnlojet/nnlojet_util.py index 15628784b6bf9290e0ac5265e6298065539a4710..e1dbedd8af5e57e7751f63e7fb22ed28b79227ec 100755 --- a/tools/nnlojet/nnlojet_util.py +++ b/tools/nnlojet/nnlojet_util.py @@ -373,7 +373,7 @@ class NNLOJETHistogram(): return '\n'.join(lines) - def to_weights(self): + def to_APPLfast_weight(self): # construct string line by line lines = []