returning only CA from addFolder

Former-commit-id: a5bc4bcb

Database/IOVDbSvc/python/IOVDbSvcConfig.py

@@ -115,7 +115,7 @@ def addFolders(configFlags,folderstrings,detDb=None,className=None):
         else:
             iovDbSvc.Folders.append(fs)
 
-    return result,None
+    return result
     
 def addFoldersSplitOnline(flags, detDb, online_folders, offline_folders, className=None, addMCString="_OFL"):
     "Add access to given folder, using either online_folder  or offline_folder. For MC, add addMCString as a postfix (default is _OFL)"
@@ -127,7 +127,7 @@ def addFoldersSplitOnline(flags, detDb, online_folders, offline_folders, classNa
         db = db+addMCString
         folders = offline_folders
     result = addFolders(flags, folders, className=className, detDb=detDb) 
-    return result, None
+    return result
 
 _dblist={
     'INDET':'COOLONL_INDET',

LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py

@@ -16,10 +16,10 @@ def LArGMCfg(configFlags):
     if doAlignment:
         if configFlags.Input.isMC:
             #Monte Carlo case:
-            result.merge(addFolders(configFlags,["/LAR/Align","/LAR/LArCellPositionShift"],"LAR_OFL")[0])
+            result.merge(addFolders(configFlags,["/LAR/Align","/LAR/LArCellPositionShift"],"LAR_OFL"))
         else:
             #Regular offline data processing
-            result.merge(addFolders(configFlags,["/LAR/Align","/LAR/LArCellPositionShift"],"LAR_ONL")[0])
+            result.merge(addFolders(configFlags,["/LAR/Align","/LAR/LArCellPositionShift"],"LAR_ONL"))
 
             
     return result