Skip to content
Snippets Groups Projects
Commit 219ed52d authored by Cedric Verstege's avatar Cedric Verstege
Browse files

Remove CMSSW path as parameter, get from env

parent 9da9ec41
Branches
No related tags found
No related merge requests found
......@@ -10,7 +10,6 @@ law.contrib.load("wlcg")
class CommonConfig(luigi.Config):
cmssw_path = luigi.Parameter()
data_period = luigi.Parameter()
dataset = luigi.Parameter()
......@@ -33,10 +32,21 @@ class LumberjackConfig(luigi.Config):
splitting = luigi.Parameter(default="ybys")
@inherits(CommonConfig)
class ExternalCMSSWTask(law.ExternalTask):
@property
def cmssw_path(self):
return os.environ["CMSSW_DIR"]
@inherits(CommonConfig)
class AnalysisTask(law.Task):
__metaclass__ = ABCMeta
@property
def cmssw_path(self):
return os.environ["CMSSW_DIR"]
def local_path(self, *path, name=None):
if name is None:
name = self.__class__.__name__
......
......@@ -3,13 +3,11 @@ import os
import law
import luigi
from analysis.framework.dataset_map import dataset_map
from analysis.framework.tasks import AnalysisTask, CommonConfig
from analysis.framework.tasks import AnalysisTask, ExternalCMSSWTask
from analysis.tasks.Skimming import SkimDataset
from luigi.util import inherits
@inherits(CommonConfig)
class ExcaliburDataConfigTemplate(law.ExternalTask):
class ExcaliburDataConfigTemplate(ExternalCMSSWTask):
def output(self):
return law.LocalFileTarget(
"{cmssw_path}/src/Excalibur/cfg/excalibur/zjet{data_period}/"
......@@ -20,7 +18,6 @@ class ExcaliburDataConfigTemplate(law.ExternalTask):
)
@inherits(CommonConfig)
class CreateExcaliburDataConfig(AnalysisTask):
excalibur_config_version = luigi.Parameter()
jet_radius = luigi.Parameter(default="4")
......
......@@ -3,7 +3,7 @@ import os
import law
import luigi
from analysis.framework.dataset_map import cross_sections, dataset_map
from analysis.framework.tasks import AnalysisTask, CommonConfig, ExcaliburConfig
from analysis.framework.tasks import AnalysisTask, ExcaliburConfig, ExternalCMSSWTask
from analysis.framework.utils import Energy_Shifts, get_energy_shift_ext
from analysis.tasks.Excalibur.CreatePileupWeights import (
CreatePileupWeights,
......@@ -16,8 +16,7 @@ from luigi.util import inherits
DY_SETS = ("DYJetsToLL", "DYJetsToLL_0J", "DYJetsToLL_1J", "DYJetsToLL_2J")
@inherits(CommonConfig)
class ExcaliburMCConfigTemplate(law.ExternalTask):
class ExcaliburMCConfigTemplate(ExternalCMSSWTask):
jet_type = luigi.Parameter(default="AK4")
def output(self):
......
......@@ -3,11 +3,10 @@ from enum import Enum
import law
import luigi
from analysis.framework.dataset_map import dataset_map
from analysis.framework.tasks import AnalysisTask, CommonConfig
from analysis.framework.tasks import AnalysisTask
from analysis.framework.utils import excalibur_env, run_command
from analysis.tasks.Skimming import SkimDataset
from law.decorator import safe_output
from luigi.util import inherits
class PileupShift(Enum):
......@@ -17,7 +16,6 @@ class PileupShift(Enum):
nominal = 1.0
@inherits(CommonConfig)
class CreatePileupWeights(AnalysisTask):
pileup_shift = luigi.EnumParameter(
default=PileupShift.nominal,
......
......@@ -3,13 +3,11 @@ import re
import law
import luigi
from analysis.framework.dataset_map import dataset_map
from analysis.framework.tasks import AnalysisTask, CommonConfig
from analysis.framework.tasks import AnalysisTask
from analysis.framework.utils import excalibur_env, run_command
from analysis.tasks.Skimming import SkimDataset
from luigi.util import inherits
@inherits(CommonConfig)
class GetGeneratorWeights(AnalysisTask):
def requires(self):
return SkimDataset.req(self)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment