use add_statmap rather than combine_statmap (#68)

* use add_statmap rather than combine_statmap ] * typo/thinko in add_statmap HR * Hierarchical removal should only be on full_data
gwastro · Nov 6, 2019 · c0cec2d · c0cec2d
1 parent 378d244
commit c0cec2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/O3exp/pipeline/analysis.ini b/O3exp/pipeline/analysis.ini
@@ -275,9 +275,11 @@ cluster-window = 10.0
 
 [combine_statmap]
 cluster-window = ${multiifo_statmap|cluster-window}
+
+[combine_statmap-full_data]
 max-hierarchical-removal = ${workflow-results|max-hierarchical-removal}
 hierarchical-removal-window = 1.0
-hierarchical-removal-ifar-limit = 100
+hierarchical-removal-ifar-thresh = 100
 
 [foreground_censor]
 

diff --git a/O3exp/pipeline/executables.ini b/O3exp/pipeline/executables.ini
@@ -14,7 +14,7 @@ average_psd = ${which:pycbc_average_psd}
 bank2hdf = ${which:pycbc_coinc_bank2hdf}
 calculate_psd = ${which:pycbc_calculate_psd}
 multiifo_coinc = ${which:pycbc_multiifo_coinc_findtrigs}
-combine_statmap = ${which:pycbc_multiifo_combine_statmap}
+combine_statmap = ${which:pycbc_multiifo_add_statmap}
 distribute_background_bins = ${which:pycbc_distribute_background_bins}
 exclude_zerolag = ${which:pycbc_multiifo_exclude_zerolag}
 fit_by_template = ${which:pycbc_fit_sngls_by_template}