default values for new parameters introduced with PR 5255

---
yaml
---
svn_rev: 138445
current_ref: refs/heads/withNewDZ
current_commit: e426c96
head_branch: refs/heads/CMSSW_4_1_X

[refs]

@@ -3,4 +3,4 @@ refs/heads/gh-pages: 90c10214674639ca7a94515baf184b0cc75e1b69
 refs/heads/CMSSW_4_1_X: a4334f9063dcad3cb0c038ac911fd8357c3bbaaa
 refs/heads/with_VBF_Hbb_fragment: 5b1f2347e6db46cfd6288879a97056d280cf27c5
 refs/heads/withOnlineToOfflineProducer: c0b9423e0d6c6d5315f93d1ee32e9bf68078d9c0
-refs/heads/withNewDZ: 7f1bc799a309e621dc5e47637f79214c17534355
+refs/heads/withNewDZ: e426c964219f35402d92f3fb2c319e300a6378ca

branches/withNewDZ/CommonTools/RecoAlgos/plugins/JetDeltaRValueMapProducer.cc

@@ -1,8 +1,8 @@
-/* \class JetDeltaRValueMapProducer
+/* \class PFJetSelector
  *
- * Associates jets using delta-R matching, and writes out
- * a valuemap of single float variables based on a StringObjectFunction. 
- * This is used for miniAOD. 
+ * Selects jets with a configurable string-based cut,
+ * and also writes out the constituents of the jet
+ * into a separate collection.
  *
  * \author: Sal Rappoccio
  *

branches/withNewDZ/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, PAYLOAD::PAYLOAD_HASH_SIZE );
+      column( PAYLOAD_HASH, std::string );
       column( INSERTION_TIME, boost::posix_time::ptime );
 
       class Table : public IPayloadMigrationTable {

branches/withNewDZ/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::invalid;
+  cond::TimeType timetype;
   bool userTime=true;
 
  //FIXME use equal_range

branches/withNewDZ/CondCore/Utilities/bin/conddb_migrate.cpp

@@ -47,21 +47,12 @@ 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");
@@ -77,18 +68,10 @@ int cond::MigrateUtilities::execute(){
   sourcedb.transaction().start( true );
   cond::MetaData  metadata(sourcedb);
   std::vector<std::string> tagToProcess;
-  if( !tag.empty() && filterPosition == -1 ){
+  if( !tag.empty() ){
     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 ); 

branches/withNewDZ/CondCore/Utilities/src/CondDBImport.cc

@@ -232,8 +232,6 @@ 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 );
 	}
@@ -246,8 +244,6 @@ 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 );
 	  }
@@ -258,8 +254,6 @@ 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 )
@@ -474,8 +468,6 @@ 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 )

branches/withNewDZ/CondCore/Utilities/src/CondFormats.h

@@ -55,10 +55,7 @@
 #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"

branches/withNewDZ/CondFormats/Serialization/python/condformats_serialization_generate.py

@@ -214,8 +214,6 @@ 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))
 

branches/withNewDZ/Configuration/PyReleaseValidation/python/MatrixInjector.py

@@ -79,9 +79,7 @@ def __init__(self,opt,mode='init',options=''):
             print '\n\tFound wmclient\n'
 
         self.defaultChain={
-            "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,
+            "RequestType" :   "TaskChain",                    #this is how we handle relvals
             "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)

branches/withNewDZ/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,50))
+steps['TTbar_13']=gen2015('TTbar_Tauola_13TeV_cfi',Kby(9,100))
 steps['TTbarLepton_13']=gen2015('TTbarLepton_Tauola_13TeV_cfi',Kby(9,100))
-steps['ZEE_13']=gen2015('ZEE_13TeV_cfi',Kby(9,50))
+steps['ZEE_13']=gen2015('ZEE_13TeV_cfi',Kby(9,100))
 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_2_0_pre6-PRE_SHI72_V7-v1',            # Run1 HI GEN-SIM (only MB = wf 140)
+    'CMSSW_7_1_0-STARTHI71_V13-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_pre6-PRE_LS172_V11-v1',       # 13 TeV samples with GEN-SIM from 720_p4;
+    'CMSSW_7_2_0_pre4-POSTLS172_V3-v2',        # 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,150))
+steps['ZMM_13']=gen2015('ZMM_13TeV_cfi',Kby(18,300))
 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,60))
-steps['H130GGgluonfusion_13']=gen2015('H130GGgluonfusion_13TeV_cfi',Kby(9,50))
+steps['ZTT_13']=gen2015('ZTT_Tauola_All_hadronic_13TeV_cfi',Kby(9,150))
+steps['H130GGgluonfusion_13']=gen2015('H130GGgluonfusion_13TeV_cfi',Kby(9,100))
 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,50))
+steps['QQH1352T_Tauola_13']=gen2015('QQH1352T_Tauola_13TeV_cfi',Kby(9,100))
 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,50))
+steps['ZmumuJets_Pt_20_300_13']=gen2015('ZmumuJets_Pt_20_300_GEN_13TeV_cfg',Kby(25,100))
 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