Allow ECAL pfrechit thresholds eta dependent in all regions, disregarding if ZS of FR

CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc

@@ -1,9 +1,9 @@
 // -*- C++ -*-
 //
 // Package:    CalibTracker/SiStripESProducers
-// Class:      SiStripBackPlaneCorrectioNFakeESSource
+// Class:      SiStripBackPlaneCorrectionFakeESSource
 //
-/**\class SiStripBackPlaneCorrectioNFakeESSource SiStripBackPlaneCorrectioNFakeESSource.h CalibTracker/SiStripESProducers/plugins/SiStripBackPlaneCorrectioNFakeESSource.cc
+/**\class SiStripBackPlaneCorrectionFakeESSource SiStripBackPlaneCorrectionFakeESSource.h CalibTracker/SiStripESProducers/plugins/SiStripBackPlaneCorrectionFakeESSource.cc
 
  Description: "fake" SiStripBackPlaneCorrection ESProducer - fixed value from configuration for each module geometry
 
@@ -22,10 +22,10 @@
 #include "CondFormats/DataRecord/interface/SiStripCondDataRecords.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class SiStripBackPlaneCorrectioNFakeESSource : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+class SiStripBackPlaneCorrectionFakeESSource : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
 public:
-  SiStripBackPlaneCorrectioNFakeESSource(const edm::ParameterSet&);
-  ~SiStripBackPlaneCorrectioNFakeESSource() override;
+  SiStripBackPlaneCorrectionFakeESSource(const edm::ParameterSet&);
+  ~SiStripBackPlaneCorrectionFakeESSource() override;
 
   void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity ) override;
 
@@ -42,7 +42,7 @@ class SiStripBackPlaneCorrectioNFakeESSource : public edm::ESProducer, public ed
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 
-SiStripBackPlaneCorrectioNFakeESSource::SiStripBackPlaneCorrectioNFakeESSource(const edm::ParameterSet& iConfig)
+SiStripBackPlaneCorrectionFakeESSource::SiStripBackPlaneCorrectionFakeESSource(const edm::ParameterSet& iConfig)
 {
   setWhatProduced(this);
   findingRecord<SiStripBackPlaneCorrectionRcd>();
@@ -51,16 +51,16 @@ SiStripBackPlaneCorrectioNFakeESSource::SiStripBackPlaneCorrectioNFakeESSource(c
   m_file = iConfig.getParameter<edm::FileInPath>("file");
 }
 
-SiStripBackPlaneCorrectioNFakeESSource::~SiStripBackPlaneCorrectioNFakeESSource() {}
+SiStripBackPlaneCorrectionFakeESSource::~SiStripBackPlaneCorrectionFakeESSource() {}
 
-void SiStripBackPlaneCorrectioNFakeESSource::setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity )
+void SiStripBackPlaneCorrectionFakeESSource::setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, const edm::IOVSyncValue& iov, edm::ValidityInterval& iValidity )
 {
   iValidity = edm::ValidityInterval{iov.beginOfTime(), iov.endOfTime()};
 }
 
 // ------------ method called to produce the data  ------------
-SiStripBackPlaneCorrectioNFakeESSource::ReturnType
-SiStripBackPlaneCorrectioNFakeESSource::produce(const SiStripBackPlaneCorrectionRcd& iRecord)
+SiStripBackPlaneCorrectionFakeESSource::ReturnType
+SiStripBackPlaneCorrectionFakeESSource::produce(const SiStripBackPlaneCorrectionRcd& iRecord)
 {
   using namespace edm::es;
 
@@ -87,4 +87,4 @@ SiStripBackPlaneCorrectioNFakeESSource::produce(const SiStripBackPlaneCorrection
 
 //define this as a plug-in
 #include "FWCore/Framework/interface/SourceFactory.h"
-DEFINE_FWK_EVENTSETUP_SOURCE(SiStripBackPlaneCorrectioNFakeESSource);
+DEFINE_FWK_EVENTSETUP_SOURCE(SiStripBackPlaneCorrectionFakeESSource);

CondCore/Utilities/plugins/Module_2XML.cc

@@ -2,10 +2,218 @@
 #include "CondCore/Utilities/src/CondFormats.h"
 
 PAYLOAD_2XML_MODULE( pluginUtilities_payload2xml ){
+  PAYLOAD_2XML_CLASS( AlCaRecoTriggerBits );
+  PAYLOAD_2XML_CLASS( AlignmentErrorsExtended );
+  PAYLOAD_2XML_CLASS( AlignmentSurfaceDeformations );
+  PAYLOAD_2XML_CLASS( Alignments );
   PAYLOAD_2XML_CLASS( BeamSpotObjects );
+  PAYLOAD_2XML_CLASS( CSCBadChambers );
+  PAYLOAD_2XML_CLASS( CSCBadStrips );
+  PAYLOAD_2XML_CLASS( CSCBadWires );
+  PAYLOAD_2XML_CLASS( CSCChamberIndex );
+  PAYLOAD_2XML_CLASS( CSCChamberMap );
+  PAYLOAD_2XML_CLASS( CSCChamberTimeCorrections );
+  PAYLOAD_2XML_CLASS( CSCCrateMap );
+  PAYLOAD_2XML_CLASS( CSCDBChipSpeedCorrection );
+  PAYLOAD_2XML_CLASS( CSCDBCrosstalk );
+  PAYLOAD_2XML_CLASS( CSCDBGains );
+  PAYLOAD_2XML_CLASS( CSCDBGasGainCorrection );
+  PAYLOAD_2XML_CLASS( CSCDBL1TPParameters );
+  PAYLOAD_2XML_CLASS( CSCDBNoiseMatrix );
+  PAYLOAD_2XML_CLASS( CSCDBPedestals );
+  PAYLOAD_2XML_CLASS( CSCDDUMap );
+  PAYLOAD_2XML_CLASS( CSCL1TPParameters );
+  PAYLOAD_2XML_CLASS( CSCRecoDigiParameters );
+  PAYLOAD_2XML_CLASS( CTPPSPixelAnalysisMask );
+  PAYLOAD_2XML_CLASS( CTPPSPixelDAQMapping );
+  PAYLOAD_2XML_CLASS( CTPPSPixelGainCalibrations );
+  PAYLOAD_2XML_CLASS( CastorChannelQuality );
+  PAYLOAD_2XML_CLASS( CastorElectronicsMap );
+  PAYLOAD_2XML_CLASS( CastorGainWidths );
+  PAYLOAD_2XML_CLASS( CastorGains );
+  PAYLOAD_2XML_CLASS( CastorPedestalWidths );
+  PAYLOAD_2XML_CLASS( CastorPedestals );
+  PAYLOAD_2XML_CLASS( CastorQIEData );
+  PAYLOAD_2XML_CLASS( CastorRecoParams );
+  PAYLOAD_2XML_CLASS( CastorSaturationCorrs );
+  PAYLOAD_2XML_CLASS( CentralityTable );
+  PAYLOAD_2XML_CLASS( DTCCBConfig );
+  PAYLOAD_2XML_CLASS( DTDeadFlag );
+  PAYLOAD_2XML_CLASS( DTKeyedConfig );
+  PAYLOAD_2XML_CLASS( DTMtime );
+  PAYLOAD_2XML_CLASS( DTReadOutMapping );
+  PAYLOAD_2XML_CLASS( DTRecoConditions );
+  PAYLOAD_2XML_CLASS( DTRecoUncertainties );
+  PAYLOAD_2XML_CLASS( DTStatusFlag );
+  PAYLOAD_2XML_CLASS( DTT0 );
+  PAYLOAD_2XML_CLASS( DTTPGParameters );
+  PAYLOAD_2XML_CLASS( DTTtrig );
+  PAYLOAD_2XML_CLASS( DYTThrObject );
+  PAYLOAD_2XML_CLASS( ESCondObjectContainer<ESChannelStatusCode> );
+  PAYLOAD_2XML_CLASS( ESCondObjectContainer<ESPedestal> );
+  PAYLOAD_2XML_CLASS( ESCondObjectContainer<float> );
+  PAYLOAD_2XML_CLASS( ESEEIntercalibConstants );
+  PAYLOAD_2XML_CLASS( ESGain );
+  PAYLOAD_2XML_CLASS( ESMIPToGeVConstant );
+  PAYLOAD_2XML_CLASS( ESMissingEnergyCalibration );
+  PAYLOAD_2XML_CLASS( ESRecHitRatioCuts );
+  PAYLOAD_2XML_CLASS( ESThresholds );
+  PAYLOAD_2XML_CLASS( ESTimeSampleWeights );
+  PAYLOAD_2XML_CLASS( EcalADCToGeVConstant );
+  PAYLOAD_2XML_CLASS( EcalCondObjectContainer<EcalChannelStatusCode> );
+  PAYLOAD_2XML_CLASS( EcalCondObjectContainer<EcalMGPAGainRatio> );
+  PAYLOAD_2XML_CLASS( EcalCondObjectContainer<EcalMappingElement> );
   PAYLOAD_2XML_CLASS( EcalCondObjectContainer<EcalPedestal> );
+  PAYLOAD_2XML_CLASS( EcalCondObjectContainer<EcalPulseCovariance> );
+  PAYLOAD_2XML_CLASS( EcalCondObjectContainer<EcalPulseShape> );
+  PAYLOAD_2XML_CLASS( EcalCondObjectContainer<EcalTPGCrystalStatusCode> );
+  PAYLOAD_2XML_CLASS( EcalCondObjectContainer<EcalTPGLinearizationConstant> );
+  PAYLOAD_2XML_CLASS( EcalCondObjectContainer<EcalTPGPedestal> );
+  PAYLOAD_2XML_CLASS( EcalCondObjectContainer<EcalXtalGroupId> );
+  PAYLOAD_2XML_CLASS( EcalCondObjectContainer<float> );
+  PAYLOAD_2XML_CLASS( EcalCondTowerObjectContainer<EcalChannelStatusCode> );
+  PAYLOAD_2XML_CLASS( EcalCondTowerObjectContainer<EcalDAQStatusCode> );
+  PAYLOAD_2XML_CLASS( EcalFunParams );
   PAYLOAD_2XML_CLASS( EcalLaserAPDPNRatios );
+  PAYLOAD_2XML_CLASS( EcalSRSettings );
+  PAYLOAD_2XML_CLASS( EcalSampleMask );
+  PAYLOAD_2XML_CLASS( EcalSamplesCorrelation );
+  PAYLOAD_2XML_CLASS( EcalTBWeights );
+  PAYLOAD_2XML_CLASS( EcalTPGFineGrainEBGroup );
+  PAYLOAD_2XML_CLASS( EcalTPGFineGrainEBIdMap );
+  PAYLOAD_2XML_CLASS( EcalTPGFineGrainStripEE );
+  PAYLOAD_2XML_CLASS( EcalTPGFineGrainTowerEE );
+  PAYLOAD_2XML_CLASS( EcalTPGLutGroup );
+  PAYLOAD_2XML_CLASS( EcalTPGLutIdMap );
+  PAYLOAD_2XML_CLASS( EcalTPGPhysicsConst );
+  PAYLOAD_2XML_CLASS( EcalTPGSlidingWindow );
+  PAYLOAD_2XML_CLASS( EcalTPGSpike );
+  PAYLOAD_2XML_CLASS( EcalTPGStripStatus );
+  PAYLOAD_2XML_CLASS( EcalTPGTowerStatus );
+  PAYLOAD_2XML_CLASS( EcalTPGWeightGroup );
+  PAYLOAD_2XML_CLASS( EcalTPGWeightIdMap );
+  PAYLOAD_2XML_CLASS( EcalTimeBiasCorrections );
+  PAYLOAD_2XML_CLASS( EcalTimeDependentCorrections );
+  PAYLOAD_2XML_CLASS( EcalTimeOffsetConstant );
+  PAYLOAD_2XML_CLASS( FileBlob );
+  PAYLOAD_2XML_CLASS( GBRForest );
+  PAYLOAD_2XML_CLASS( GBRForestD );
+//PAYLOAD_2XML_CLASS( HBHENegativeEFilter );
+  PAYLOAD_2XML_CLASS( HcalChannelQuality );
+  PAYLOAD_2XML_CLASS( HcalElectronicsMap );
+  PAYLOAD_2XML_CLASS( HcalFlagHFDigiTimeParams );
+  PAYLOAD_2XML_CLASS( HcalFrontEndMap );
+  PAYLOAD_2XML_CLASS( HcalGains );
+//PAYLOAD_2XML_CLASS( HcalItemCollById<HFPhase1PMTData> );
+  PAYLOAD_2XML_CLASS( HcalL1TriggerObjects );
+  PAYLOAD_2XML_CLASS( HcalLUTCorrs );
+  PAYLOAD_2XML_CLASS( HcalLongRecoParams );
+  PAYLOAD_2XML_CLASS( HcalLutMetadata );
+  PAYLOAD_2XML_CLASS( HcalMCParams );
+  PAYLOAD_2XML_CLASS( HcalPFCorrs );
+  PAYLOAD_2XML_CLASS( HcalParameters );
+  PAYLOAD_2XML_CLASS( HcalPedestalWidths );
+  PAYLOAD_2XML_CLASS( HcalPedestals );
+  PAYLOAD_2XML_CLASS( HcalQIEData );
+  PAYLOAD_2XML_CLASS( HcalQIETypes );
+  PAYLOAD_2XML_CLASS( HcalRecoParams );
+  PAYLOAD_2XML_CLASS( HcalRespCorrs );
+  PAYLOAD_2XML_CLASS( HcalSiPMCharacteristics );
+  PAYLOAD_2XML_CLASS( HcalSiPMParameters );
+  PAYLOAD_2XML_CLASS( HcalTPChannelParameters );
+  PAYLOAD_2XML_CLASS( HcalTPParameters );
+  PAYLOAD_2XML_CLASS( HcalTimeCorrs );
+  PAYLOAD_2XML_CLASS( HcalZSThresholds );
+  PAYLOAD_2XML_CLASS( JME::JetResolutionObject );
+  PAYLOAD_2XML_CLASS( JetCorrectorParametersCollection );
+  PAYLOAD_2XML_CLASS( L1CaloEcalScale );
+  PAYLOAD_2XML_CLASS( L1CaloEtScale );
+  PAYLOAD_2XML_CLASS( L1CaloGeometry );
+  PAYLOAD_2XML_CLASS( L1CaloHcalScale );
+  PAYLOAD_2XML_CLASS( L1GctChannelMask );
+  PAYLOAD_2XML_CLASS( L1GctJetFinderParams );
+  PAYLOAD_2XML_CLASS( L1GtBoardMaps );
+  PAYLOAD_2XML_CLASS( L1GtParameters );
+  PAYLOAD_2XML_CLASS( L1GtPrescaleFactors );
+  PAYLOAD_2XML_CLASS( L1GtPsbSetup );
+  PAYLOAD_2XML_CLASS( L1GtStableParameters );
+  PAYLOAD_2XML_CLASS( L1GtTriggerMask );
+  PAYLOAD_2XML_CLASS( L1GtTriggerMenu );
+  PAYLOAD_2XML_CLASS( L1MuCSCPtLut );
+  PAYLOAD_2XML_CLASS( L1MuCSCTFAlignment );
+  PAYLOAD_2XML_CLASS( L1MuCSCTFConfiguration );
+  PAYLOAD_2XML_CLASS( L1MuDTEtaPatternLut );
+  PAYLOAD_2XML_CLASS( L1MuDTExtLut );
+  PAYLOAD_2XML_CLASS( L1MuDTPhiLut );
+  PAYLOAD_2XML_CLASS( L1MuDTPtaLut );
+  PAYLOAD_2XML_CLASS( L1MuDTQualPatternLut );
+  PAYLOAD_2XML_CLASS( L1MuDTTFMasks );
+  PAYLOAD_2XML_CLASS( L1MuDTTFParameters );
+  PAYLOAD_2XML_CLASS( L1MuGMTChannelMask );
+  PAYLOAD_2XML_CLASS( L1MuGMTParameters );
+  PAYLOAD_2XML_CLASS( L1MuGMTScales );
+  PAYLOAD_2XML_CLASS( L1MuTriggerPtScale );
+  PAYLOAD_2XML_CLASS( L1MuTriggerScales );
+  PAYLOAD_2XML_CLASS( L1RCTChannelMask );
+  PAYLOAD_2XML_CLASS( L1RCTNoisyChannelMask );
+  PAYLOAD_2XML_CLASS( L1RCTParameters );
+  PAYLOAD_2XML_CLASS( L1RPCBxOrConfig );
+  PAYLOAD_2XML_CLASS( L1RPCConeDefinition );
+  PAYLOAD_2XML_CLASS( L1RPCConfig );
+  PAYLOAD_2XML_CLASS( L1RPCHsbConfig );
+  PAYLOAD_2XML_CLASS( L1RPCHwConfig );
+  PAYLOAD_2XML_CLASS( L1TGlobalPrescalesVetos );
+  PAYLOAD_2XML_CLASS( L1TMuonBarrelParams );
+  PAYLOAD_2XML_CLASS( L1TMuonEndCapForest );
+  PAYLOAD_2XML_CLASS( L1TMuonEndCapParams );
+  PAYLOAD_2XML_CLASS( L1TMuonGlobalParams );
+  PAYLOAD_2XML_CLASS( L1TMuonOverlapParams );
+  PAYLOAD_2XML_CLASS( L1TUtmTriggerMenu );
+  PAYLOAD_2XML_CLASS( L1TriggerKey );
+  PAYLOAD_2XML_CLASS( L1TriggerKeyList );
+  PAYLOAD_2XML_CLASS( MagFieldConfig );
+  PAYLOAD_2XML_CLASS( OOTPileupCorrectionBuffer );
+  PAYLOAD_2XML_CLASS( PCaloGeometry );
+  PAYLOAD_2XML_CLASS( PGeometricDet );
+  PAYLOAD_2XML_CLASS( PGeometricDetExtra );
+  PAYLOAD_2XML_CLASS( PTrackerParameters );
+  PAYLOAD_2XML_CLASS( PerformancePayloadFromBinnedTFormula );
+  PAYLOAD_2XML_CLASS( PerformancePayloadFromTFormula );
+  PAYLOAD_2XML_CLASS( PerformanceWorkingPoint );
+//PAYLOAD_2XML_CLASS( PhysicsTools::Calibration::Histogram3D<double, double, double, double> );
+  PAYLOAD_2XML_CLASS( PhysicsTools::Calibration::MVAComputerContainer );
+  PAYLOAD_2XML_CLASS( QGLikelihoodObject );
+  PAYLOAD_2XML_CLASS( RPCAMCLinkMap );
+  PAYLOAD_2XML_CLASS( RPCClusterSize );
+  PAYLOAD_2XML_CLASS( RPCDCCLinkMap );
+  PAYLOAD_2XML_CLASS( RPCEMap );
+  PAYLOAD_2XML_CLASS( RPCLBLinkMap );
+  PAYLOAD_2XML_CLASS( RPCStripNoises );
+  PAYLOAD_2XML_CLASS( RecoIdealGeometry );
   PAYLOAD_2XML_CLASS( RunInfo );
-  PAYLOAD_2XML_CLASS( SiStripLatency );
+  PAYLOAD_2XML_CLASS( SiPixelCPEGenericErrorParm );
+  PAYLOAD_2XML_CLASS( SiPixelDynamicInefficiency );
+  PAYLOAD_2XML_CLASS( SiPixelFedCablingMap );
+  PAYLOAD_2XML_CLASS( SiPixelGainCalibrationForHLT );
+  PAYLOAD_2XML_CLASS( SiPixelGainCalibrationOffline );
+  PAYLOAD_2XML_CLASS( SiPixelGenErrorDBObject );
+  PAYLOAD_2XML_CLASS( SiPixelLorentzAngle );
+  PAYLOAD_2XML_CLASS( SiPixelQuality );
+  PAYLOAD_2XML_CLASS( SiPixelTemplateDBObject );
+  PAYLOAD_2XML_CLASS( SiStripApvGain );
+  PAYLOAD_2XML_CLASS( SiStripBackPlaneCorrection );
+  PAYLOAD_2XML_CLASS( SiStripBadStrip );
   PAYLOAD_2XML_CLASS( SiStripConfObject );
+  PAYLOAD_2XML_CLASS( SiStripDetVOff );
+  PAYLOAD_2XML_CLASS( SiStripFedCabling );
+  PAYLOAD_2XML_CLASS( SiStripLatency );
+  PAYLOAD_2XML_CLASS( SiStripLorentzAngle );
+  PAYLOAD_2XML_CLASS( SiStripNoises );
+  PAYLOAD_2XML_CLASS( SiStripPedestals );
+  PAYLOAD_2XML_CLASS( SiStripThreshold );
+//PAYLOAD_2XML_CLASS( StorableDoubleMap<AbsOOTPileupCorrection> );
+  PAYLOAD_2XML_CLASS( TrackProbabilityCalibration );
+  PAYLOAD_2XML_CLASS( l1t::CaloParams );
+  PAYLOAD_2XML_CLASS( lumi::LumiSectionData );
+  PAYLOAD_2XML_CLASS( std::vector<unsigned long long> );
 }

CondCore/Utilities/src/CondFormats.h

@@ -227,6 +227,8 @@
 #include "CondFormats/L1TObjects/interface/CaloConfig.h"
 #include "CondFormats/L1TObjects/interface/CaloParams.h"
 #include "CondFormats/L1TObjects/interface/L1TMuonBarrelParams.h"
+#include "CondFormats/L1TObjects/interface/L1TMuonEndCapForest.h"
+#include "CondFormats/L1TObjects/interface/L1TMuonEndCapParams.h"
 #include "CondFormats/L1TObjects/interface/L1TMuonGlobalParams.h"
 #include "CondFormats/L1TObjects/interface/L1TMuonOverlapParams.h"
 #include "CondFormats/L1TObjects/interface/L1TUtmAlgorithm.h"

CondFormats/SiPixelObjects/src/SiPixelGainCalibrationOffline.cc

@@ -188,7 +188,7 @@ float SiPixelGainCalibrationOffline::getGain(const int& col, const int& row, con
   int maxRow = lengthOfColumnData - (lengthOfColumnData % numberOfRowsToAverageOver_) - 1;
   if (col >= nCols || row > maxRow){
     throw cms::Exception("CorruptedData")
-      << "[SiPixelGainCalibrationOffline::getPed] Pixel out of range: col " << col;
+      << "[SiPixelGainCalibrationOffline::getPed] Pixel out of range: col " << col << " row " << row;
   }  
   return decodeGain(s.datum & 0xFF);
 }

Configuration/AlCa/python/autoCond.py

@@ -40,19 +40,19 @@
     # GlobalTag for Run2 HLT for HI: it points to the online GT
     'run2_hlt_hi'       :   '100X_dataRun2_HLTHI_frozen_v1',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot)
-    'phase1_2017_design'       :  '100X_mc2017_design_IdealBS_v2',
+    'phase1_2017_design'       :  '100X_mc2017_design_IdealBS_v3',
     # GlobalTag for MC production with realistic conditions for Phase1 2017 detector
-    'phase1_2017_realistic'    : '100X_mc2017_realistic_v2',
+    'phase1_2017_realistic'    : '100X_mc2017_realistic_v3',
     # GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in DECO mode
-    'phase1_2017_cosmics'      : '100X_mc2017cosmics_realistic_deco_v2',
+    'phase1_2017_cosmics'      : '100X_mc2017cosmics_realistic_deco_v3',
     # GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in PEAK mode
-    'phase1_2017_cosmics_peak' : '100X_mc2017cosmics_realistic_peak_v2',
+    'phase1_2017_cosmics_peak' : '100X_mc2017cosmics_realistic_peak_v3',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for full Phase1 2018 (and 0,0,0-centred beamspot)
-    'phase1_2018_design'       : '100X_upgrade2018_design_IdealBS_v4',
+    'phase1_2018_design'       : '100X_upgrade2018_design_IdealBS_v6',
     # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector
-    'phase1_2018_realistic'    : '100X_upgrade2018_realistic_v7',
+    'phase1_2018_realistic'    : '100X_upgrade2018_realistic_v10',
     # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector,  Strip tracker in DECO mode
-    'phase1_2018_cosmics'      :   '100X_upgrade2018cosmics_realistic_deco_v5',
+    'phase1_2018_cosmics'      :   '100X_upgrade2018cosmics_realistic_deco_v8',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
     'phase1_2019_design'       : '100X_postLS2_design_v2', # GT containing design conditions for postLS2
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019

Configuration/DataProcessing/python/Merge.py

@@ -10,6 +10,7 @@
 
 from FWCore.ParameterSet.Config import Process, EndPath
 from FWCore.ParameterSet.Modules import OutputModule, Source, Service
+from Configuration.EventContent.EventContent_cff import NANOAODEventContent
 import FWCore.ParameterSet.Types as CfgTypes
 
 
@@ -64,7 +65,7 @@ def mergeProcess(*inputFiles, **options):
     if newDQMIO:
         outMod = OutputModule("DQMRootOutputModule")
     elif mergeNANO:
-        outMod = OutputModule("NanoAODOutputModule")
+        outMod = OutputModule("NanoAODOutputModule",NANOAODEventContent.clone())
     else:
         outMod = OutputModule("PoolOutputModule")
 

Configuration/PyReleaseValidation/python/relval_standard.py

@@ -222,7 +222,7 @@
 # reminiAOD wf on 2016H 80X input
 workflows[136.7721] = ['',['RunJetHT2016H_reminiaod','REMINIAOD_data2016','HARVESTDR2_REMINIAOD_data2016']]
 # nanoAOD wf on 2016H 80X input
-workflows[136.7722] = ['',['RunJetHT2016H_nano','NANOEDM2016_80X']]
+workflows[136.7722] = ['',['RunJetHT2016H_nano','NANOEDM2016_80X','HARVESTNANOAOD2016_80X']]
 
 ### run 2017B ###
 workflows[136.780] = ['',['RunHLTPhy2017B','HLTDR2_2017','RECODR2_2017reHLT_Prompt','HARVEST2017']]
@@ -425,11 +425,10 @@
 # nanoaod wf without intermediate EDM,  starting from existing MINIAOD inputs
 workflows[1325.6] = ['', ['TTbar_13_94XNanoAODINPUT','NANOAODMC2017']]
 # nanoaod wf with intermediate EDM and merge step, starting from existing MINIAOD inputs
-workflows[1325.7] = ['', ['TTbar_13_94XNanoAODINPUT','NANOEDMMC2017']]
-workflows[1325.8] = ['', ['TTbar_13_92XNanoAODINPUT','NANOEDMMC2017_92X']]
+workflows[1325.7] = ['', ['TTbar_13_94XNanoAODINPUT','NANOEDMMC2017','HARVESTNANOAODMC2017']]
+workflows[1325.8] = ['', ['TTbar_13_92XNanoAODINPUT','NANOEDMMC2017_92X','HARVESTNANOAODMC2017_92X']]
 #using ZEE as I cannot find TT at CERN
-workflows[1329.1] = ['', ['ZEE_13_80XNanoAODINPUT','NANOEDMMC2016_80X']]
-
+workflows[1329.1] = ['', ['ZEE_13_80XNanoAODINPUT','NANOEDMMC2016_80X','HARVESTNANOAODMC2016_80X']]
 
 
 workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']]

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -2151,6 +2151,14 @@ def gen2018HiMix(fragment,howMuch):
 steps['NANOEDM2017_92X'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'}, steps['NANOEDM2017'] ])
 steps['NANOEDM2016_80X'] = merge([{'--era': 'Run2_2016,run2_miniAOD_80XLegacy'}, steps['NANOEDM2017'] ])
 
+steps['HARVESTNANOAODMC2017']=merge([{'-s':'HARVESTING:@nanoAODDQM','--conditions': 'auto:phase1_2017_realistic','--era': 'Run2_2017'},steps['HARVESTUP15']])
+steps['HARVESTNANOAODMC2017_92X']=merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'},steps['HARVESTNANOAODMC2017']])
+steps['HARVESTNANOAODMC2016_80X']=merge([{'--conditions': 'auto:run2_mc','--era': 'Run2_2016,run2_miniAOD_80XLegacy'},steps['HARVESTNANOAODMC2017']])
+
+steps['HARVESTNANOAOD2017']=merge([{'--data':'','-s':'HARVESTING:@nanoAODDQM','--conditions':'auto:run2_data_relval','--era':'Run2_2017'},steps['HARVESTDR2']])
+steps['HARVESTNANOAOD2017_92X']=merge([{'--era': 'Run2_2017,run2_nanoAOD_92X'},steps['HARVESTNANOAOD2017']])
+steps['HARVESTNANOAOD2016_80X']=merge([{'--era': 'Run2_2016,run2_miniAOD_80XLegacy'},steps['HARVESTNANOAOD2017']])
+
 steps['NANOMERGE'] = { '-s': 'ENDJOB', '-n': 1000 , '--eventcontent' : 'NANOAODSIM','--datatier': 'NANOAODSIM', '--conditions': 'auto:run2_mc' }
 
 #################################################################################