|
2 | 2 | """ |
3 | 3 | BSD 3-Clause License |
4 | 4 |
|
5 | | -Copyright (c) 2024, University of Southern California |
| 5 | +Copyright (c) 2025, University of Southern California |
6 | 6 | All rights reserved. |
7 | 7 |
|
8 | 8 | Redistribution and use in source and binary forms, with or without |
@@ -60,6 +60,7 @@ def __init__(self, i_r_stations, i_vmodel_name, sim_id=0, acc=True): |
60 | 60 | self.phase = None |
61 | 61 | self.hf_fhi = None |
62 | 62 | self.lf_flo = None |
| 63 | + self.hf_merge_flag = None |
63 | 64 |
|
64 | 65 | def run(self): |
65 | 66 | """ |
@@ -100,11 +101,14 @@ def run(self): |
100 | 101 | self.phase = config.PHASE |
101 | 102 | self.hf_fhi = config.HF_FHI |
102 | 103 | self.lf_flo = config.LF_FLO |
| 104 | + self.hf_merge_flag = config.HF_MERGE_FLAG |
103 | 105 |
|
104 | 106 | # Check if we have a different merging frequency |
105 | 107 | if 'MATCH_MERGING_FREQUENCY' in vmodel_params: |
106 | 108 | self.hf_fhi = float(vmodel_params['MATCH_MERGING_FREQUENCY']) |
107 | 109 | self.lf_flo = float(vmodel_params['MATCH_MERGING_FREQUENCY']) |
| 110 | + if 'HF_MERGE_FLAG' in vmodel_params: |
| 111 | + self.hf_merge_flag = float(vmodel_params['HF_MERGE_FLAG']) |
108 | 112 |
|
109 | 113 | # Set match method |
110 | 114 | if config.MATCH_METHOD == 1: |
@@ -579,8 +583,8 @@ def run(self): |
579 | 583 | (os.path.join(install.A_GP_BIN_DIR, "wcc_add")) + |
580 | 584 | "f1=1.00 t1=%f inbin1=0 infile1=%s " % |
581 | 585 | (config.LF_TSTART, infile1) + |
582 | | - "f2=1.00 t2=%f inbin2=0 infile2=%s " % |
583 | | - (config.HF_TSTART, infile2) + |
| 586 | + "f2=%f t2=%f inbin2=0 infile2=%s " % |
| 587 | + (self.hf_merge_flag, config.HF_TSTART, infile2) + |
584 | 588 | "outbin=0 outfile=%s >> %s 2>&1" % |
585 | 589 | (outfile, self.log)) |
586 | 590 | bband_utils.runprog(progstring, abort_on_error=True, |
|
0 commit comments