Merge pull request #5053 from Martin-Grunewald/PATfix

PAT fix to deal with GTs with added payloads
cms-sw · Aug 26, 2014 · 0a41caf · 0a41caf
2 parents 5e59fa7 + 66f2527
commit 0a41caf
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/PhysicsTools/PatAlgos/python/tools/cmsswVersionTools.py b/PhysicsTools/PatAlgos/python/tools/cmsswVersionTools.py
@@ -64,7 +64,10 @@ def __init__( self ):
         self.addParameter( self._defaultParameters, 'relVal'       , 'RelValTTbar'                                                       , '' )
         self.addParameter( self._defaultParameters, 'dataTier'     , 'GEN-SIM-RECO'                                                      , '' )
         self.addParameter( self._defaultParameters, 'condition'    , 'startup'                                                           , '' )
-        self.addParameter( self._defaultParameters, 'globalTag'    , autoCond[ self.getDefaultParameters()[ 'condition' ].value ][ : -5 ], 'auto from \'condition\'' )
+        gt = autoCond[ self.getDefaultParameters()[ 'condition' ].value ]
+        if isinstance(gt,tuple) or isinstance(gt,list):
+            gt = gt[0]
+        self.addParameter( self._defaultParameters, 'globalTag'    , gt[ : -5 ]                                                          , 'auto from \'condition\'' )
         self.addParameter( self._defaultParameters, 'maxVersions'  , 3                                                                   , '' )
         self.addParameter( self._defaultParameters, 'skipFiles'    , 0                                                                   , '' )
         self.addParameter( self._defaultParameters, 'numberOfFiles', -1                                                                  , 'all' )