mirror of
https://github.com/vale981/bachelor_thesis
synced 2025-03-05 09:31:42 -05:00
initialize mi grid before parallel execution
This commit is contained in:
parent
1ee4081f5c
commit
ceaa16d8a3
3 changed files with 2 additions and 4 deletions
|
@ -2,7 +2,6 @@
|
|||
% me generator settings
|
||||
ME_SIGNAL_GENERATOR Comix;
|
||||
EVENT_GENERATION_MODE Unweighted;
|
||||
GENERATE_RESULTS_DIRECTORY 1;
|
||||
|
||||
% collider setup
|
||||
BEAM_1 2212; BEAM_ENERGY_1 = 6500.;
|
||||
|
|
|
@ -35,7 +35,7 @@ NUM_CPUS = $(shell nproc)
|
|||
EVENT_COUNT_CPU = $(shell echo "$(EVENT_COUNT) / $(NUM_CPUS)" | bc)
|
||||
THIS_DIR := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))
|
||||
SET_RIVET := RIVET_ANALYSIS_PATH="$(THIS_DIR)$(ANALYSIS_DIR)"
|
||||
SHERPA_ARGS := -e $(EVENT_COUNT_CPU) "RESULT_DIRECTORY:=Results" "ANALYSIS_OUTPUT:=analysis" -a Rivet
|
||||
SHERPA_ARGS := -e $(EVENT_COUNT_CPU) "RESULT_DIRECTORY:=Results" "MI_RESULT_DIRECTORY:=Results_MI" "DECAY_RESULT_DIRECTORY:=Results_Decay" "ANALYSIS_OUTPUT:=analysis" -a Rivet
|
||||
OUT_YODA_FILE_NAMES := $(foreach card,$(RUNCARDS),$(card).yoda)
|
||||
OUT_YODA_FILES := $(foreach name,$(OUT_YODA_FILE_NAMES),$(OUT_DIR)/$(name))
|
||||
OUT_YODA_FILE_NAMES_WITH_FLAGS := $(foreach card,$(RUNCARDS),$(card).yoda:'$(shell cat $(RUNCARD_DIR)/$(card)/plot.flags)')
|
||||
|
@ -76,7 +76,7 @@ $(OUT_YODA_FILES): $(OUT_DIR)/%.yoda: $(RUNCARD_DIR)/%/$(SHERPA_EXT_RUNCARD) $(A
|
|||
sed -e '/% TEMPLATE/r $(R_DIR)$(SHERPA_EXT_RUNCARD)' $(BASE_RUNCARD) > $(R_DIR)Run.dat
|
||||
|
||||
@printf "\033[1;32mRunning Sherpa\033[0m\n"
|
||||
cd $(R_DIR) && $(SHERPA) $(SHERPA_ARGS) -e 0
|
||||
cd $(R_DIR) && $(SHERPA) $(SHERPA_ARGS) -e 1 -a 0
|
||||
cd $(R_DIR) && \
|
||||
$(SET_RIVET) $(THIS_DIR)/run_n_sherpas.fish $(NUM_CPUS) $(SHERPA_ARGS) "EVT_OUTPUT:=$(EVT_OUTPUT)"
|
||||
cd $(R_DIR) && yodamerge *.yoda -o $(YODA_FILE) \
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
% me generator settings
|
||||
ME_SIGNAL_GENERATOR Comix;
|
||||
EVENT_GENERATION_MODE Unweighted;
|
||||
GENERATE_RESULTS_DIRECTORY 1;
|
||||
|
||||
% collider setup
|
||||
BEAM_1 2212; BEAM_ENERGY_1 = 6500.;
|
||||
|
|
Loading…
Add table
Reference in a new issue