Merge CMSSW_10_6_X into CMSSW_10_6_DEVEL_X.

cms-sw · Mar 12, 2019 · de175a1 · de175a1
2 parents 631babc + ac146f1
commit de175a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Configuration/DataProcessing/python/Merge.py b/Configuration/DataProcessing/python/Merge.py
@@ -27,6 +27,7 @@ def mergeProcess(*inputFiles, **options):
     - newDQMIO : specifies if the new DQM format should be used to merge the files
     - output_file : sets the output file name
     - output_lfn : sets the output LFN
+    - mergeNANO : to merge NanoAOD
     - bypassVersionCheck : to bypass version check in case merging happened in lower version of CMSSW (i.e. UL HLT case). This will be TRUE by default.
 
     """
@@ -54,6 +55,7 @@ def mergeProcess(*inputFiles, **options):
         process.add_(Service("DQMStore"))
     else:
         process.source = Source("PoolSource")
+        process.source.bypassVersionCheck = CfgTypes.untracked.bool(bypassVersionCheck)
         if dropDQM:
             process.source.inputCommands = CfgTypes.untracked.vstring('keep *','drop *_EDMtoMEConverter_*_*')
     process.source.fileNames = CfgTypes.untracked(CfgTypes.vstring())
@@ -72,9 +74,6 @@ def mergeProcess(*inputFiles, **options):
     else:
         outMod = OutputModule("PoolOutputModule")
 
-    # To bypass the version check in the merge process (TRUE by default)
-    process.source.bypassVersionCheck = CfgTypes.untracked.bool(bypassVersionCheck)
-
     outMod.fileName = CfgTypes.untracked.string(outputFilename)
     if outputLFN != None:
         outMod.logicalFileName = CfgTypes.untracked.string(outputLFN)

diff --git a/OnlineDB/EcalCondDB/src/EcalDBConnection.cc b/OnlineDB/EcalCondDB/src/EcalDBConnection.cc
@@ -55,7 +55,6 @@ EcalDBConnection::EcalDBConnection( string sid,
   this->sid = sid;
   this->user = user;
   this->pass = pass;
-  this->port = port;
 }
 
 EcalDBConnection::~EcalDBConnection()  noexcept(false) {