diff --git a/lawluigi_configs/KingMaker_luigi.cfg b/lawluigi_configs/KingMaker_luigi.cfg index 709ac56..74fc724 100644 --- a/lawluigi_configs/KingMaker_luigi.cfg +++ b/lawluigi_configs/KingMaker_luigi.cfg @@ -6,7 +6,7 @@ log_level = WARNING keep_alive = False ping_interval = 20 wait_interval = 20 -max_reschedules = 10 +max_reschedules = 2 [DEFAULT] name = KingMaker @@ -112,4 +112,4 @@ friend_mapping = {} silent = True ; set to False to print out the datasets -[QuantitiesMap] \ No newline at end of file +[QuantitiesMap] diff --git a/processor/tasks/CROWNBase.py b/processor/tasks/CROWNBase.py index 695cce5..4461160 100644 --- a/processor/tasks/CROWNBase.py +++ b/processor/tasks/CROWNBase.py @@ -11,6 +11,9 @@ import hashlib import time +# Determine KingMaker base directory dynamically from this file's location +KINGMAKER_BASE = os.path.normpath(os.path.join(os.path.dirname(__file__), "../..")) + class ProduceBase(Task, WrapperTask): """ @@ -154,7 +157,25 @@ class CROWNExecuteBase(HTCondorWorkflow, law.LocalWorkflow): files_per_task = luigi.IntParameter() def htcondor_output_directory(self): - return law.LocalDirectoryTarget(self.local_path(f"htcondor_files/{self.nick}")) + path = os.path.join( + KINGMAKER_BASE, + "data", + self.production_tag, + "htcondor_files", + "ntuples", + self.nick, + ) + class_name = self.__class__.__name__ + if "Friend" in class_name: + path = os.path.join( + KINGMAKER_BASE, + "data", + self.production_tag, + "htcondor_files", + self.friend_name, + self.nick, + ) + return law.LocalDirectoryTarget(path) def htcondor_job_config(self, config, job_num, branches): class_name = self.__class__.__name__ diff --git a/sample_database b/sample_database index 555130c..48aa0e1 160000 --- a/sample_database +++ b/sample_database @@ -1 +1 @@ -Subproject commit 555130c9cb3f5871bd0b308ab0f1ec5ac019d6d9 +Subproject commit 48aa0e1a6d9248f1ec894ba605a68a53b2796357