cms-sw · rappoccio · Sep 16, 2014 · Sep 16, 2014 · Sep 16, 2014 · Sep 16, 2014
diff --git a/CommonTools/ParticleFlow/python/pfType1MET_cfi.py b/CommonTools/ParticleFlow/python/pfType1MET_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-# Type-1 met corrections (AK5PFJets)
+# Type-1 met corrections (AK4PFJets)
 # remember about including ES producer definition e.g. JetMETCorrections.Configuration.L2L3Corrections_Summer08Redigi_cff
 
 pfType1MET = cms.EDProducer("Type1PFMET",
@@ -11,6 +11,6 @@
     jetPTthreshold = cms.double(20.0),
     # pfMET should be not corrected for HF 0.7
     inputUncorMetLabel = cms.string("pfMET"),
-    corrector = cms.string("L2L3JetCorrectorAK5PF")
+    corrector = cms.string("L2L3JetCorrectorAK4PF")
 )
 
diff --git a/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc b/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc
@@ -1,8 +1,8 @@
-/* \class PFJetSelector
+/* \class JetDeltaRValueMapProducer
  *
- * Selects jets with a configurable string-based cut,
- * and also writes out the constituents of the jet
- * into a separate collection.
+ * Associates jets using delta-R matching, and writes out
+ * a valuemap of single float variables based on a StringObjectFunction. 
+ * This is used for miniAOD. 
  *
  * \author: Sal Rappoccio
  *

diff --git a/CondCore/CondDB/src/IOVSchema.h b/CondCore/CondDB/src/IOVSchema.h
@@ -165,7 +165,7 @@ namespace cond {
 
       column( SOURCE_ACCOUNT, std::string );
       column( SOURCE_TOKEN, std::string );
-      column( PAYLOAD_HASH, std::string );
+      column( PAYLOAD_HASH, std::string, PAYLOAD::PAYLOAD_HASH_SIZE );
       column( INSERTION_TIME, boost::posix_time::ptime );
 
       class Table : public IPayloadMigrationTable {

diff --git a/CondCore/ESSources/plugins/CondDBESSource.cc b/CondCore/ESSources/plugins/CondDBESSource.cc
@@ -344,7 +344,7 @@ CondDBESSource::setIntervalFor( const edm::eventsetup::EventSetupRecordKey& iKey
 
   // compute the smallest interval (assume all objects have the same timetype....)                                                                                                          
   cond::ValidityInterval recordValidity(1,cond::TIMELIMIT);
-  cond::TimeType timetype;
+  cond::TimeType timetype = cond::TimeType::invalid;
   bool userTime=true;
 
  //FIXME use equal_range

diff --git a/CondCore/Utilities/bin/conddb_migrate.cpp b/CondCore/Utilities/bin/conddb_migrate.cpp
@@ -47,12 +47,21 @@ cond::MigrateUtilities::~MigrateUtilities(){
 int cond::MigrateUtilities::execute(){
 
   bool debug = hasDebug();
+  int filterPosition = -1;
   std::string tag("");
   if( hasOptionValue("tag")) {
     tag = getOptionValue<std::string>("tag");
     if(debug){
       std::cout << "tag " << tag << std::endl;
     }  
+    if( tag[0] == '*' ){ 
+      tag = tag.substr(1);
+      filterPosition = 0;
+    }
+    if( tag[tag.size()-1] == '*' ){
+      tag = tag.substr(0,tag.size()-1);
+      filterPosition = 1;
+    }
   }
   bool replace = hasOptionValue("replace");
   bool validate = !hasOptionValue("fast");
@@ -68,10 +77,18 @@ int cond::MigrateUtilities::execute(){
   sourcedb.transaction().start( true );
   cond::MetaData  metadata(sourcedb);
   std::vector<std::string> tagToProcess;
-  if( !tag.empty() ){
+  if( !tag.empty() && filterPosition == -1 ){
     tagToProcess.push_back( tag );
   } else {
     metadata.listAllTags( tagToProcess );
+    if( filterPosition != -1 ) {
+      std::vector<std::string> filteredList;
+      for( const auto& t: tagToProcess ) {
+	size_t ptr = t.find( tag );
+	if( ptr != std::string::npos && ptr < filterPosition ) filteredList.push_back( t );
+      }
+      tagToProcess = filteredList;
+    }
   }
 
   cond::DbSession logdb = openDbSession("log", cond::Auth::COND_READER_ROLE, true ); 

diff --git a/CondCore/Utilities/src/CondDBImport.cc b/CondCore/Utilities/src/CondDBImport.cc
@@ -232,6 +232,8 @@ namespace cond {
 	    bool exists = false;
             std::pair<std::string,boost::shared_ptr<void> > missingPayload = fetchIfExists( sourcePid, source, exists );
 	    if( exists ) pid = import( source, sourcePid, missingPayload.first, missingPayload.second.get(), destination );
+	    std::cout <<"WARNING: OID "<<sourcePid<<" will be mapped to HASH "<<pid<<std::endl;
+	    if( pid != "0" ) destination.addMigratedPayload( source.connectionString(), sourcePid, pid );
 	  }
           converted.addKey( kitem.first, pid );
 	}
@@ -244,6 +246,8 @@ namespace cond {
 	      bool exists = false;
 	      std::pair<std::string,boost::shared_ptr<void> > missingPayload = fetchIfExists( sourcePid, source, exists );
 	      if( exists ) pid = import( source, sourcePid, missingPayload.first, missingPayload.second.get(), destination );
+	      std::cout <<"WARNING: OID "<<sourcePid<<" will be mapped to HASH "<<pid<<std::endl;
+	      if( pid != "0" ) destination.addMigratedPayload( source.connectionString(), sourcePid, pid );
 	    }
 	    converted.addKey( ritem.first, kitem.first, pid );
 	  }
@@ -254,6 +258,8 @@ namespace cond {
       IMPORT_PAYLOAD_CASE( lumi::LumiSectionData )
       IMPORT_PAYLOAD_CASE( MixingModuleConfig )
       IMPORT_PAYLOAD_CASE( MuScleFitDBobject )
+      IMPORT_PAYLOAD_CASE( OOTPileupCorrectionBuffer )
+      IMPORT_PAYLOAD_CASE( StorableDoubleMap<AbsOOTPileupCorrection> )
       IMPORT_PAYLOAD_CASE( PhysicsTools::Calibration::MVAComputerContainer )
       IMPORT_PAYLOAD_CASE( PCaloGeometry )
       IMPORT_PAYLOAD_CASE( PGeometricDet )
@@ -468,6 +474,8 @@ namespace cond {
     FETCH_PAYLOAD_CASE( HcalRespCorrs )
     FETCH_PAYLOAD_CASE( HcalTimeCorrs )
     FETCH_PAYLOAD_CASE( HcalZSThresholds )
+    FETCH_PAYLOAD_CASE( OOTPileupCorrectionBuffer )
+    FETCH_PAYLOAD_CASE( StorableDoubleMap<AbsOOTPileupCorrection> )
     FETCH_PAYLOAD_CASE( JetCorrectorParametersCollection )
     FETCH_PAYLOAD_CASE( L1CaloEcalScale )
     FETCH_PAYLOAD_CASE( L1CaloEtScale )

diff --git a/CondCore/Utilities/src/CondFormats.h b/CondCore/Utilities/src/CondFormats.h
@@ -55,7 +55,10 @@
 #include "CondFormats/EcalObjects/interface/EcalTimeBiasCorrections.h"
 #include "CondFormats/EcalObjects/interface/EcalTimeDependentCorrections.h"
 #include "CondFormats/EgammaObjects/interface/GBRForest.h"
+#include "CondFormats/HcalObjects/interface/AbsOOTPileupCorrection.h"
 #include "CondFormats/HcalObjects/interface/HcalElectronicsMap.h"
+#include "CondFormats/HcalObjects/interface/OOTPileupCorrectionBuffer.h"
+#include "CondFormats/HcalObjects/interface/StorableDoubleMap.h"
 #include "CondFormats/JetMETObjects/interface/JetCorrectorParameters.h"
 #include "CondFormats/JetMETObjects/interface/QGLikelihoodObject.h"
 #include "CondFormats/L1TObjects/interface/L1CaloEcalScale.h"

diff --git a/CondFormats/Serialization/python/condformats_serialization_generate.py b/CondFormats/Serialization/python/condformats_serialization_generate.py
@@ -214,6 +214,8 @@ def get_serializable_classes_members(node, all_template_types=None, namespace=''
                 # Template non-type parameters (e.g. <int N>)
                 elif member.kind == clang.cindex.CursorKind.TEMPLATE_NON_TYPE_PARAMETER:
                     type_string = get_type_string(member)
+		    if not type_string: 
+		       type_string = get_basic_type_string(member)
                     logging.info('    Found template non-type parameter: %s %s', type_string, member.spelling)
                     template_types.append((type_string, member.spelling))
 

diff --git a/Configuration/AlCa/python/autoCond_condDBv2.py b/Configuration/AlCa/python/autoCond_condDBv2.py
@@ -39,16 +39,16 @@
 # L1 configuration used during Run2012D
 conditions_L1_Run2012D = (
     # L1 GT menu 2012 v3, used during Run2012D
-    'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc,L1GtTriggerMenuRcd,frontier://FrontierProd/CMS_COND_31X_L1T',
+    'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc,L1GtTriggerMenuRcd,frontier://FrontierProd/CMS_CONDITIONS',
     # L1 GCT configuration with 5 GeV jet seed threshold, used since Run2012C
-    'L1GctJetFinderParams_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1GctJetFinderParamsRcd,frontier://FrontierProd/CMS_COND_31X_L1T',
-    'L1HfRingEtScale_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1HfRingEtScaleRcd,frontier://FrontierProd/CMS_COND_31X_L1T',
-    'L1HtMissScale_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1HtMissScaleRcd,frontier://FrontierProd/CMS_COND_31X_L1T',
-    'L1JetEtScale_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1JetEtScaleRcd,frontier://FrontierProd/CMS_COND_31X_L1T',
+    'L1GctJetFinderParams_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1GctJetFinderParamsRcd,frontier://FrontierProd/CMS_CONDITIONS',
+    'L1HfRingEtScale_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1HfRingEtScaleRcd,frontier://FrontierProd/CMS_CONDITIONS',
+    'L1HtMissScale_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1HtMissScaleRcd,frontier://FrontierProd/CMS_CONDITIONS',
+    'L1JetEtScale_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1JetEtScaleRcd,frontier://FrontierProd/CMS_CONDITIONS',
     # L1 CSCTF configuration used since Run2012B
-    'L1MuCSCPtLut_key-11_mc,L1MuCSCPtLutRcd,frontier://FrontierProd/CMS_COND_31X_L1T',
+    'L1MuCSCPtLut_key-11_mc,L1MuCSCPtLutRcd,frontier://FrontierProd/CMS_CONDITIONS',
     # L1 DTTF settings used since Run2012C
-    'L1MuDTTFParameters_dttf12_TSC_03_csc_col_mc,L1MuDTTFParametersRcd,frontier://FrontierProd/CMS_COND_31X_L1T',
+    'L1MuDTTFParameters_dttf12_TSC_03_csc_col_mc,L1MuDTTFParametersRcd,frontier://FrontierProd/CMS_CONDITIONS',
 )
 
 autoCond['run1_mc']          = ( autoCond['run1_mc'], ) \

diff --git a/Configuration/Applications/python/Options.py b/Configuration/Applications/python/Options.py
@@ -34,10 +34,10 @@
                   default=None,
                   dest="conditions")
 
-parser.add_option("--useCondDBv2",
+parser.add_option("--useCondDBv1",
                   help="use conditions DB V1",
                   action="store_false",
-                  default=True,
+                  default=False,
                   dest="useCondDBv1")
 
 parser.add_option("--eventcontent",

diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py
@@ -79,7 +79,9 @@ def __init__(self,opt,mode='init',options=''):
             print '\n\tFound wmclient\n'
 
         self.defaultChain={
-            "RequestType" :   "TaskChain",                    #this is how we handle relvals
+            "RequestType" :    "TaskChain",                    #this is how we handle relvals
+            "SubRequestType" : "RelVal",                       #this is how we handle relvals, now that TaskChain is also used for central MC production
+            "RequestPriority": 1000000,
             "Requestor": self.user,                           #Person responsible
             "Group": self.group,                              #group for the request
             "CMSSWVersion": os.getenv('CMSSW_VERSION'),       #CMSSW Version (used for all tasks in chain)

diff --git a/Configuration/PyReleaseValidation/python/relval_extendedgen.py b/Configuration/PyReleaseValidation/python/relval_extendedgen.py
@@ -15,8 +15,6 @@
 # the two sets are exclusive
 
 # LO Generators
-workflows[505]=['',['DYToLL_M-50_13TeV_pythia8','HARVGEN']]
-workflows[506]=['',['WToLNu_13TeV_pythia8','HARVGEN']]
 workflows[507]=['',['SoftQCDDiffractive_13TeV_pythia8','HARVGEN']]
 workflows[508]=['',['SoftQCDnonDiffractive_13TeV_pythia8','HARVGEN']]
 workflows[509]=['',['SoftQCDelastic_13TeV_pythia8','HARVGEN']]

diff --git a/Configuration/PyReleaseValidation/python/relval_generator.py b/Configuration/PyReleaseValidation/python/relval_generator.py
@@ -19,6 +19,8 @@
 workflows[502]=['',['QCD_Pt-30_TuneZ2star_13TeV_pythia6','HARVGEN']]
 workflows[503]=['',['MinBias_13TeV_pythia8','HARVGEN']]
 workflows[504]=['',['QCD_Pt-30_13TeV_pythia8','HARVGEN']]
+workflows[505]=['',['DYToLL_M-50_13TeV_pythia8','HARVGEN']]
+workflows[506]=['',['WToLNu_13TeV_pythia8','HARVGEN']]
 workflows[511]=['',['QCD_Pt-30_8TeV_herwigpp','HARVGEN']]
 
 # Matrix Element Generations (LHE Generation)

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -299,9 +299,9 @@ def gen2015(fragment,howMuch):
 steps['LM1_sfts']=gen('LM1_sfts_8TeV_cfi',Kby(9,100))
 steps['QCD_FlatPt_15_3000']=gen('QCDForPF_8TeV_cfi',Kby(5,100))
 steps['QCD_FlatPt_15_3000HS']=gen('QCDForPF_8TeV_cfi',Kby(50,100))
-steps['TTbar_13']=gen2015('TTbar_Tauola_13TeV_cfi',Kby(9,100))
+steps['TTbar_13']=gen2015('TTbar_Tauola_13TeV_cfi',Kby(9,50))
 steps['TTbarLepton_13']=gen2015('TTbarLepton_Tauola_13TeV_cfi',Kby(9,100))
-steps['ZEE_13']=gen2015('ZEE_13TeV_cfi',Kby(9,100))
+steps['ZEE_13']=gen2015('ZEE_13TeV_cfi',Kby(9,50))
 steps['Wjet_Pt_80_120_13']=gen2015('Wjet_Pt_80_120_13TeV_cfi',Kby(9,100))
 steps['Wjet_Pt_3000_3500_13']=gen2015('Wjet_Pt_3000_3500_13TeV_cfi',Kby(9,50))
 steps['LM1_sfts_13']=gen2015('LM1_sfts_13TeV_cfi',Kby(9,100))
@@ -323,7 +323,7 @@ def identitySim(wf):
 
 baseDataSetRelease=[
     'CMSSW_7_1_0_pre7-PRE_STA71_V3-v1',        # run1 samples; keep GEN-SIM fixed to 710_pre7, for samples not routinely produced
-    'CMSSW_7_1_0-STARTHI71_V13-v1',            # Run1 HI GEN-SIM (only MB = wf 140)
+    'CMSSW_7_2_0_pre6-PRE_SHI72_V7-v1',            # Run1 HI GEN-SIM (only MB = wf 140)
     'CMSSW_6_2_0_pre8-PRE_ST62_V8_FastSim-v1', # for fastsim id test
     # 'CMSSW_6_2_0_pre8-PRE_SH62_V15-v2',      # Run1 HI GEN-SIM (only HydjetQ_B3_2760)   -- unused in 72_pre4
     # 'CMSSW_6_1_0_pre6-STARTHI61_V6-v1',      # Run1 HI GEN-SIM (only HydjetQ_B0_2760)   -- unused in 72_pre4
@@ -333,7 +333,7 @@ def identitySim(wf):
     #'CMSSW_7_1_0_pre5-START71_V1-v1',         # 8 TeV , for the one sample which is part of the routine relval production (MinBias)   -- unused in 72_pre4
     'CMSSW_7_1_0_pre5-START71_V1-v2',          # 8 TeV , for the one sample which is part of the routine relval production (RelValZmumuJets_Pt_20_300, because of -v2)
                                                # this an previous should be unified, when -v2 will be gone
-    'CMSSW_7_2_0_pre4-POSTLS172_V3-v2',        # 13 TeV samples with GEN-SIM from 720_p4;
+    'CMSSW_7_2_0_pre6-PRE_LS172_V11-v1',       # 13 TeV samples with GEN-SIM from 720_p4;
     ]
 
 # note: INPUT commands to be added once GEN-SIM w/ 13TeV+PostLS1Geo will be available 
@@ -459,19 +459,19 @@ def genS(fragment,howMuch):
 steps['WE_13']=gen2015('WE_13TeV_cfi',Kby(9,100))
 steps['WM_13']=gen2015('WM_13TeV_cfi',Kby(9,200))
 steps['WpM_13']=gen2015('WpM_13TeV_cfi',Kby(9,200))
-steps['ZMM_13']=gen2015('ZMM_13TeV_cfi',Kby(18,300))
+steps['ZMM_13']=gen2015('ZMM_13TeV_cfi',Kby(18,150))
 steps['ZpMM_13']=gen2015('ZpMM_13TeV_cfi',Kby(9,200))
 
 steps['ZTT']=genS('ZTT_Tauola_All_hadronic_8TeV_cfi',Kby(9,150))
 steps['H130GGgluonfusion']=genS('H130GGgluonfusion_8TeV_cfi',Kby(9,100))
 steps['PhotonJets_Pt_10']=genS('PhotonJet_Pt_10_8TeV_cfi',Kby(9,150))
 steps['QQH1352T_Tauola']=genS('QQH1352T_Tauola_8TeV_cfi',Kby(9,100))
-steps['ZTT_13']=gen2015('ZTT_Tauola_All_hadronic_13TeV_cfi',Kby(9,150))
-steps['H130GGgluonfusion_13']=gen2015('H130GGgluonfusion_13TeV_cfi',Kby(9,100))
+steps['ZTT_13']=gen2015('ZTT_Tauola_All_hadronic_13TeV_cfi',Kby(9,60))
+steps['H130GGgluonfusion_13']=gen2015('H130GGgluonfusion_13TeV_cfi',Kby(9,50))
 steps['PhotonJets_Pt_10_13']=gen2015('PhotonJet_Pt_10_13TeV_cfi',Kby(9,150))
-steps['QQH1352T_Tauola_13']=gen2015('QQH1352T_Tauola_13TeV_cfi',Kby(9,100))
+steps['QQH1352T_Tauola_13']=gen2015('QQH1352T_Tauola_13TeV_cfi',Kby(9,50))
 steps['ZmumuJets_Pt_20_300']=gen('ZmumuJets_Pt_20_300_GEN_8TeV_cfg',Kby(25,100))
-steps['ZmumuJets_Pt_20_300_13']=gen2015('ZmumuJets_Pt_20_300_GEN_13TeV_cfg',Kby(25,100))
+steps['ZmumuJets_Pt_20_300_13']=gen2015('ZmumuJets_Pt_20_300_GEN_13TeV_cfg',Kby(25,50))
 steps['ADDMonoJet_d3MD3']=genS('ADDMonoJet_8TeV_d3MD3_cfi',Kby(9,100))
 steps['ADDMonoJet_d3MD3_13']=gen2015('ADDMonoJet_13TeV_d3MD3_cfi',Kby(9,100))
 steps['RSKKGluon_m3000GeV_13']=gen2015('RSKKGluon_m3000GeV_13TeV_cff',Kby(9,100))                  # re-named to remove RelvalRelval in the dataset name 

diff --git a/DQM/DTMonitorModule/src/DTScalerInfoTask.cc b/DQM/DTMonitorModule/src/DTScalerInfoTask.cc
@@ -102,9 +102,20 @@ void DTScalerInfoTask::analyze(const edm::Event& e, const edm::EventSetup& c){
 
   //retrieve the luminosity
   edm::Handle<LumiScalersCollection> lumiScalers;
-  e.getByToken(scalerToken_, lumiScalers);
-  LumiScalersCollection::const_iterator lumiIt = lumiScalers->begin();
-  trendHistos["AvgLumivsLumiSec"]->accumulateValueTimeSlot(lumiIt->instantLumi());
+  if (e.getByToken(scalerToken_, lumiScalers)) {
+    if (lumiScalers->begin() != lumiScalers->end()) {
+      LumiScalersCollection::const_iterator lumiIt = lumiScalers->begin();
+      trendHistos["AvgLumivsLumiSec"]->accumulateValueTimeSlot(lumiIt->instantLumi());
+    }
+    else {
+      LogVerbatim("DTDQM|DTMonitorModule|DTScalerInfoTask")
+	<< "[DTScalerInfoTask]: LumiScalersCollection size == 0" << endl;
+    }
+  }
+  else {
+    LogVerbatim("DTDQM|DTMonitorModule|DTScalerInfoTask")
+      << "[DTScalerInfoTask]: LumiScalersCollection getByToken call failed" << endl;
+  }
 
 }
 

diff --git a/DQM/Integration/config/beammonitor_overview_layouts.py b/DQM/Integration/config/beammonitor_overview_layouts.py