From c75ea031871c16547748c43df0eb17b3e5510190 Mon Sep 17 00:00:00 2001 From: Andres Tanasijczuk Date: Thu, 8 Oct 2015 13:20:41 +0200 Subject: [PATCH] Change CRAB config parameter name: secondaryDataset -> secondaryInputDataset. --- src/python/CRABClient/ClientMapping.py | 3 ++- src/python/CRABClient/JobType/Analysis.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/python/CRABClient/ClientMapping.py b/src/python/CRABClient/ClientMapping.py index 0676b07b0..be0cd83be 100644 --- a/src/python/CRABClient/ClientMapping.py +++ b/src/python/CRABClient/ClientMapping.py @@ -25,7 +25,7 @@ 'userfiles' : {'default': None, 'config': ['Data.userInputFiles'], 'type': 'ListType', 'required': False}, 'dbsurl' : {'default': 'global', 'config': ['Data.inputDBS'], 'type': 'StringType', 'required': False}, 'useparent' : {'default': None, 'config': ['Data.useParent'], 'type': 'BooleanType', 'required': False}, - 'secondarydata' : {'default': None, 'config': ['Data.secondaryDataset'], 'type': 'StringType', 'required': False}, + 'secondarydata' : {'default': None, 'config': ['Data.secondaryInputDataset'], 'type': 'StringType', 'required': False}, 'ignorelocality' : {'default': False, 'config': ['Data.ignoreLocality'], 'type': 'BooleanType', 'required': False}, 'splitalgo' : {'default': None, 'config': ['Data.splitting'], 'type': 'StringType', 'required': True }, 'algoargs' : {'default': None, 'config': ['Data.unitsPerJob'], 'type': 'IntType', 'required': True }, @@ -83,6 +83,7 @@ 'JobType.maxmemory' : {'newParam' : 'JobType.maxMemoryMB', 'version' : None}, 'JobType.maxjobruntime' : {'newParam' : 'JobType.maxJobRuntimeMin', 'version' : None}, 'JobType.allowNonProductionCMSSW' : {'newParam' : 'JobType.allowUndistributedCMSSW', 'version' : 'v3.3.16'}, + 'Data.secondaryDataset' : {'newParam' : 'Data.secondaryInputDataset', 'version' : 'v3.3.1511'}, } diff --git a/src/python/CRABClient/JobType/Analysis.py b/src/python/CRABClient/JobType/Analysis.py index 226824ae1..36f408a79 100644 --- a/src/python/CRABClient/JobType/Analysis.py +++ b/src/python/CRABClient/JobType/Analysis.py @@ -45,8 +45,8 @@ def run(self, filecacheurl = None): 'edmoutfiles' : [], } - if getattr(self.config.Data, 'useParent', False) and getattr(self.config.Data, 'secondaryDataset', None): - msg = "Invalid CRAB configuration: Parameters Data.useParent and Data.secondaryDataset cannot be used together." + if getattr(self.config.Data, 'useParent', False) and getattr(self.config.Data, 'secondaryInputDataset', None): + msg = "Invalid CRAB configuration: Parameters Data.useParent and Data.secondaryInputDataset cannot be used together." raise ConfigurationException(msg) # Get SCRAM environment