Change CRAB config parameter name: publishDataName -> outputDatasetTag.

mmascher · Oct 16, 2015 · 057d682 · 057d682
1 parent 8ff8ef9
commit 057d682
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/bin/crab2cfgTOcrab3py b/bin/crab2cfgTOcrab3py
@@ -77,7 +77,7 @@ paramsMap = [
     ('Data'     , 'unitsPerJob'          , False, ''       , ''                         , _getunits),           #_getunits does the work
     ('Data'     , 'lumiMask'             , False, 'CMSSW'  , 'lumi_mask'                , RawConfigParser.get),
     ('Data'     , 'publication'          , False, 'USER'   , 'publish_data'             , RawConfigParser.getboolean),
-    ('Data'     , 'publishDataName'      , False, 'USER'   , 'publish_data_name'        , RawConfigParser.get),
+    ('Data'     , 'outputDatasetTag'     , False, 'USER'   , 'publish_data_name'        , RawConfigParser.get),
     ('Data'     , 'publishDBS'           , False, 'USER'   , 'dbs_url_for_publication'  , RawConfigParser.get),
     ('Data'     , 'runRange'             , False, 'CMSSW'  , 'runselection'             , RawConfigParser.get),
     ('User'     , 'voRole'               , False, 'GRID'   , 'role'                     , RawConfigParser.get),

diff --git a/doc/FullConfiguration.py b/doc/FullConfiguration.py
@@ -38,7 +38,7 @@
 ## Specific data options
 config.section_("Data")
 #config.Data.inputDataset = '/cms/data/set'
-#config.Data.publishDataName = 'MyReskimForTwo'
+#config.Data.outputDatasetTag = 'MyReskimForTwo'
 ## Splitting Algorithms
 #config.Data.splitting = 'LumiBased'
 #config.Data.splitting = 'EventBased'

diff --git a/doc/config/FullConfiguration.py b/doc/config/FullConfiguration.py
@@ -33,7 +33,7 @@
 ## Specific data options
 config.section_("Data")
 #config.Data.inputDataset = '/cms/data/set'
-#config.Data.publishDataName = 'MyReskimForTwo'
+#config.Data.outputDatasetTag = 'MyReskimForTwo'
 ## Splitting Algorithms
 #config.Data.splitting = 'LumiBased'
 #config.Data.splitting = 'EventBased'

diff --git a/doc/crabclient/userdoc/running.rst b/doc/crabclient/userdoc/running.rst
@@ -321,8 +321,8 @@ You can only publish data for completed tasks, the publication information does
 
 Datasets are named according to the config parameters::
 
-    config.Data.publishDataName = 'EWVTestCRAB3Skim'
+    config.Data.outputDatasetTag = 'EWVTestCRAB3Skim'
     config.Data.processingVersion = 'v%s' % myVersion
 
-as as described in the next section in the case of multiple output files. Defaults are taken for both publishDataName and processingVersion if one or both are left unspecified.
+as as described in the next section in the case of multiple output files. Defaults are taken for both outputDatasetTag and processingVersion if one or both are left unspecified.
 
diff --git a/src/python/CRABAPI/test_Task.py b/src/python/CRABAPI/test_Task.py
@@ -88,7 +88,7 @@ def upload(self, name):
         myTask.config.Data.unitsPerJob = 100
         myTask.config.Data.totalUnits = 1000
         myTask.config.Data.publication = True
-        myTask.config.Data.publishDataName = 'CRABAPI-Unittest'
+        myTask.config.Data.outputDatasetTag = 'CRABAPI-Unittest'
         myTask.config.section_("Site")
         myTask.config.Site.storageSite = 'T2_US_Nowhere'
         val = myTask.submit()

diff --git a/src/python/CRABClient/ClientMapping.py b/src/python/CRABClient/ClientMapping.py
@@ -34,7 +34,7 @@
                   'publication'    : {'default': True,       'config': ['Data.publication'],                'type': 'BooleanType', 'required': False},
                   'publishdbsurl'  : {'default': 'phys03',   'config': ['Data.publishDBS'],                 'type': 'StringType',  'required': False},
                   #the 2 here to the publishname was added because of https://github.com/dmwm/CRABServer/issues/4947
-                  'publishname2'    : {'default': '',         'config': ['Data.publishDataName'],            'type': 'StringType',  'required': False},
+                  'publishname2'   : {'default': '',         'config': ['Data.outputDatasetTag'],           'type': 'StringType',  'required': False},
                   'publishgroupname' : {'default': False,    'config': ['Data.publishWithGroupName'],       'type': 'BooleanType', 'required': False},
                   'jobtype'        : {'default': 'Analysis', 'config': ['JobType.pluginName',
                                                                         'JobType.externalPluginFile'],      'type': 'StringType',  'required': False},
@@ -85,6 +85,7 @@
     'JobType.allowNonProductionCMSSW' : {'newParam' : 'JobType.allowUndistributedCMSSW', 'version' : 'v3.3.16'},
     'Data.secondaryDataset'           : {'newParam' : 'Data.secondaryInputDataset',      'version' : 'v3.3.1511'},
     'Data.primaryDataset'             : {'newParam' : 'Data.outputPrimaryDataset',       'version' : 'v3.3.1511'},
+    'Data.publishDataName'            : {'newParam' : 'Data.outputDatasetTag',           'version' : 'v3.3.1511'},
 }
 
 

diff --git a/test/data/mapper.py b/test/data/mapper.py
@@ -19,7 +19,7 @@
                             "RequestorDN"       : {"default": None,             "config": None,                     "type": "StringType",  "required": True },
                             "SaveLogs"          : {"default": False,            "config": 'General.transferLogs',   "type": "BooleanType", "required": True },
                             "asyncDest"         : {"default": None,             "config": 'Site.storageSite',       "type": "StringType",  "required": True },
-                            "PublishDataName"   : {"default": str(time.time()), "config": 'Data.publishDataName',   "type": "StringType",  "required": True },
+                            "PublishDataName"   : {"default": str(time.time()), "config": 'Data.outputDatasetTag',  "type": "StringType",  "required": True },
                             "ProcessingVersion" : {"default": "v1",             "config": 'Data.processingVersion', "type": "StringType",  "required": True },
                             "DbsUrl"            : {"default": "http://cmsdbsprod.cern.ch/cms_dbs_prod_global/servlet/DBSServlet", "config": 'Data.inputDBS', "type": "StringType",  "required": True },
                             "SiteWhitelist"     : {"default": None,             "config": 'Site.whitelist',         "type": "ListType",    "required": False},