Merge branch 'cms-sw:master' into l1t_me0

Author: woohyeonHeo

Alignment/CommonAlignmentProducer/python/LSNumberFilter_cfi.py

@@ -6,5 +6,6 @@
     veto_HLT_Menu = [
         "LumiScan",
         "PPS",
-        "ECALTiming"]
+        "ECALTiming",
+        "ECAL"]
     )

CommonTools/RecoUtils/plugins/LeptonFSRProducer.cc

@@ -10,24 +10,21 @@
  */
 
 #include <memory>
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/global/EDProducer.h"
 
+#include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
+#include "DataFormats/PatCandidates/interface/Electron.h"
+#include "DataFormats/PatCandidates/interface/GenericParticle.h"
+#include "DataFormats/PatCandidates/interface/Muon.h"
+#include "DataFormats/PatCandidates/interface/PackedCandidate.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/StreamID.h"
 
-#include "DataFormats/Candidate/interface/Candidate.h"
-#include "DataFormats/PatCandidates/interface/PackedCandidate.h"
-#include "DataFormats/PatCandidates/interface/GenericParticle.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-
-#include "DataFormats/PatCandidates/interface/Muon.h"
-#include "DataFormats/PatCandidates/interface/Electron.h"
-#include "DataFormats/Common/interface/ValueMap.h"
-
 class LeptonFSRProducer : public edm::global::EDProducer<> {
 public:
   explicit LeptonFSRProducer(const edm::ParameterSet& iConfig)
@@ -217,7 +214,7 @@ void LeptonFSRProducer::produce(edm::StreamID streamID, edm::Event& iEvent, cons
     }
   }  // end of loop over pfCands
 
-  edm::OrphanHandle<std::vector<pat::GenericParticle>> oh = iEvent.put(std::move(fsrPhotons));
+  iEvent.put(std::move(fsrPhotons));
 
   {
     std::unique_ptr<edm::ValueMap<int>> bareIdx(new edm::ValueMap<int>());

CommonTools/UtilAlgos/interface/AssociationVectorSelector.h

@@ -68,9 +68,10 @@ void AssociationVectorSelector<KeyRefProd, CVal, KeySelector, ValSelector>::prod
   KeyRefProd ref = evt.getRefBeforePut<collection_t>();
   unique_ptr<association_t> selectedAssociation(new association_t(ref, selected.get()));
   size = selected->size();
-  OrphanHandle<collection_t> oh = evt.put(std::move(selected));
-  for (size_t i = 0; i != size; ++i)
+  evt.put(std::move(selected));
+  for (size_t i = 0; i != size; ++i) {
     selectedAssociation->setValue(i, selectedValues[i]);
+  }
   evt.put(std::move(selectedAssociation));
 }
 

CommonTools/UtilAlgos/interface/ObjectSelectorBase.h

@@ -40,7 +40,7 @@ class ObjectSelectorBase : public Base {
         srcToken_(
             this->template consumes<typename Selector::collection>(cfg.template getParameter<edm::InputTag>("src"))),
         filter_(false),
-        throwOnMissing_(cfg.template getUntrackedParameter<bool>("throwOnMissing", true)),
+        throwOnMissing_(cfg.getUntrackedParameter<bool>("throwOnMissing", true)),
         selectorInit_(this->consumesCollector()),
         selector_(cfg, this->consumesCollector()),
         sizeSelector_(reco::modules::make<SizeSelector>(cfg)),
@@ -69,10 +69,13 @@ class ObjectSelectorBase : public Base {
   bool filter(edm::Event& evt, const edm::EventSetup& es) override {
     selectorInit_.init(selector_, evt, es);
     edm::Handle<typename Selector::collection> source;
+    evt.getByToken(srcToken_, source);
+    // if throwOnMissing is false, but the input source is not valid
+    // allow all events to pass
     if (!throwOnMissing_ && !source.isValid()) {
       return !filter_;
     }
-    evt.getByToken(srcToken_, source);
+
     StoreManager manager(source);
     selector_.select(source, evt, es);
     manager.cloneAndStore(selector_.begin(), selector_.end(), evt);

CondFormats/HGCalObjects/interface/HGCalCalibParamSoA.h

@@ -11,23 +11,29 @@
 //#include "CondFormats/HGCalObjects/interface/HGCalMappingModuleIndexer.h"
 
 namespace hgcalrechit {
+  using Vector32f = Eigen::Matrix<float, 32, 1>;
+  using Vector8f = Eigen::Matrix<float, 8, 1>;
+  using Vector3f = Eigen::Matrix<float, 3, 1>;
+  constexpr float TOAtops = 24.41f;
 
   // Generate structure of channel-level arrays (SoA) layout with RecHit dataformat
   GENERATE_SOA_LAYOUT(HGCalCalibParamSoALayout,
-                      SOA_COLUMN(float, ADC_ped),       // ADC pedestals, O(91)
-                      SOA_COLUMN(float, Noise),         // noise, O(3)
-                      SOA_COLUMN(float, CM_slope),      // common mode slope, O(0.25)
-                      SOA_COLUMN(float, CM_ped),        // common mode pedestal (offset), O(92)
-                      SOA_COLUMN(float, BXm1_slope),    // leakage correction from previous bunch, O(0.0)
-                      SOA_COLUMN(float, TOTtoADC),      // TOT linearization in ADC units, O(15)
-                      SOA_COLUMN(float, TOT_ped),       // TOT pedestal (offset), O(9.0)
-                      SOA_COLUMN(float, TOT_lin),       // threshold at which TOT is linear, O(200)
-                      SOA_COLUMN(float, TOT_P0),        // coefficient pol2 in nonlinear region, O(145)
-                      SOA_COLUMN(float, TOT_P1),        // coefficient pol2 in nonlinear region, O(1.0)
-                      SOA_COLUMN(float, TOT_P2),        // coefficient pol2 in nonlinear region, O(0.004)
-                      SOA_COLUMN(float, TOAtops),       // TOA conversion to time (ps)
-                      SOA_COLUMN(float, MIPS_scale),    // MIPS scale
-                      SOA_COLUMN(unsigned char, valid)  // only 1 bit used: if false = mask dead channel
+                      SOA_COLUMN(float, ADC_ped),             // ADC pedestals, O(91)
+                      SOA_COLUMN(float, Noise),               // noise, O(3)
+                      SOA_COLUMN(float, CM_slope),            // common mode slope, O(0.25)
+                      SOA_COLUMN(float, CM_ped),              // common mode pedestal (offset), O(92)
+                      SOA_COLUMN(float, BXm1_slope),          // leakage correction from previous bunch, O(0.0)
+                      SOA_COLUMN(float, TOTtoADC),            // TOT linearization in ADC units, O(15)
+                      SOA_COLUMN(float, TOT_ped),             // TOT pedestal (offset), O(9.0)
+                      SOA_COLUMN(float, TOT_lin),             // threshold at which TOT is linear, O(200)
+                      SOA_COLUMN(float, TOT_P0),              // coefficient pol2 in nonlinear region, O(145)
+                      SOA_COLUMN(float, TOT_P1),              // coefficient pol2 in nonlinear region, O(1.0)
+                      SOA_COLUMN(float, TOT_P2),              // coefficient pol2 in nonlinear region, O(0.004)
+                      SOA_EIGEN_COLUMN(Vector32f, TOA_CTDC),  // TOA coarse TDC correction
+                      SOA_EIGEN_COLUMN(Vector8f, TOA_FTDC),   // TOA fine TDC correction
+                      SOA_EIGEN_COLUMN(Vector3f, TOA_TW),     // TOA timewalk correction
+                      SOA_COLUMN(float, MIPS_scale),          // MIPS scale
+                      SOA_COLUMN(unsigned char, valid)        // only 1 bit used: if false = mask dead channel
   )
   using HGCalCalibParamSoA = HGCalCalibParamSoALayout<>;
 

CondFormats/Serialization/interface/eos/portable_iarchive.hpp

@@ -409,7 +409,7 @@ namespace eos {
       // created through BOOST_STRONG_TYPEDEF(X, some unsigned int) like
       // library_version_type, collection_size_type, item_version_type,
       // class_id_type, object_id_type, version_type and tracking_type
-      load((typename boost::uint_t<sizeof(T) * CHAR_BIT>::least&)(t));
+      load(static_cast<T::base_type&>(t));
     }
   };
 

CondTools/Geometry/test/writehelpers/createExtended2016Payloads.sh

@@ -11,7 +11,7 @@ echo ${mytag}
 
 # Set the tag in all the scripts and the metadata text files
 sed -i {s/TagXX/${mytag}/g} *.py
-sed -i {s/TagXX/${mytag}/g} *.txt
+#sed -i {s/TagXX/${mytag}/g} *.txt
 sed -i {s/TagXX/${mytag}/g} splitExtended2016Database.sh
 
 # First read in the little XML files and create the

CondTools/Geometry/test/writehelpers/createExtended2017Payloads.sh

@@ -11,7 +11,7 @@ echo ${mytag}
 
 # Set the tag in all the scripts and the metadata text files
 sed -i {s/TagXX/${mytag}/g} *.py
-sed -i {s/TagXX/${mytag}/g} *.txt
+#sed -i {s/TagXX/${mytag}/g} *.txt
 sed -i {s/TagXX/${mytag}/g} splitExtended2017Database.sh
 
 # First read in the little XML files and create the

CondTools/Geometry/test/writehelpers/createExtended2017Plan1Payloads.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-
+function die { echo $1: status $2 ;  exit $2; }
 
 if [ $# -ne 1 ]
 then
@@ -10,80 +10,79 @@ mytag=$1
 echo ${mytag}
 
 # Set the tag in all the scripts and the metadata text files
-sed -i {s/TagXX/${mytag}/g} *.py
+#sed -i {s/TagXX/${mytag}/g} *.py
 compgen -G "*.txt" > /dev/null && sed -i {s/TagXX/${mytag}/g} *.txt
 sed -i {s/TagXX/${mytag}/g} splitExtended2017Plan1Database.sh
 
 # First read in the little XML files and create the
-# large XML file for the Phase1_R30F12_HCal Ideal scenario.
-# Input cff                                             Output file
-# GeometryExtended2017Plan1_cff                       geSingleBigFile.xml
-cmsRun geometryExtended2017Plan1_xmlwriter.py
+# big XML file for the Extended2017Plan1 scenario.
+cmsRun geometryExtended2017Plan1_xmlwriter.py || die 'failed geometryExtended2017Plan1_xmlwriter.py' $?
 
 # Now convert the content of the large XML file into
 # a "blob" and write it to the database.
 # Also reads in the little XML files again and fills
 # the DDCompactView. From the DDCompactView the
 # reco parts of the database are also filled.
-cmsRun geometryExtended2017Plan1_writer.py
+cmsRun geometryExtended2017Plan1_writer.py --tag=${mytag} || die 'failed geometryExtended2017Plan1_writer.py' $?
 
 # Now put the other scenarios into the database.
 # Input the many XML files referenced by the cff file and
 # output a single big XML file.
 # This is repeated several times below.  The sed commands
-# serve to give the following sequence of input and output
+# serve to give the correct sequence of input and output
 # files
-#
-# Input cff                    Output file
-# GeometryIdeal_cff            giSingleBigFile.xml
-#
-sed -i '{s/Extended2017Plan1/Extended2017Plan1ZeroMaterial/g}' geometryExtended2017Plan1_xmlwriter.py
-sed -i '{s/\/ge/\/gez/g}' geometryExtended2017Plan1_xmlwriter.py
-cmsRun geometryExtended2017Plan1_xmlwriter.py
-
-sed -i '{s/Extended2017Plan1ZeroMaterial/Extended2017Plan1FlatMinus05Percent/g}' geometryExtended2017Plan1_xmlwriter.py
-sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2017Plan1_xmlwriter.py
-cmsRun geometryExtended2017Plan1_xmlwriter.py
-
-sed -i '{s/Extended2017Plan1FlatMinus10Percent/Extended2017Plan1FlatPlus05Percent/g}' geometryExtended2017Plan1_xmlwriter.py
-sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2017Plan1_xmlwriter.py
-cmsRun geometryExtended2017Plan1_xmlwriter.py
-
-sed -i '{s/Extended2017Plan1FlatPlus05Percent/Extended2017Plan1FlatPlus10Percent/g}' geometryExtended2017Plan1_xmlwriter.py
-sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2017Plan1_xmlwriter.py
-cmsRun geometryExtended2017Plan1_xmlwriter.py
+
+#sed -i '{s/Extended2017Plan1/Extended2017Plan1ZeroMaterial/g}' geometryExtended2017Plan1_xmlwriter.py
+#sed -i '{s/\/ge/\/gez/g}' geometryExtended2017Plan1_xmlwriter.py
+cmsRun geometryExtended2017Plan1_xmlwriter.py --geom=Extended2017Plan1ZeroMaterial --out=gez || die 'failed geometryExtended2017Plan1_xmlwriter.py Extended2017Plan1ZeroMaterial' $?
+
+#sed -i '{s/Extended2017Plan1ZeroMaterial/Extended2017Plan1FlatMinus05Percent/g}' geometryExtended2017Plan1_xmlwriter.py
+#sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2017Plan1_xmlwriter.py
+cmsRun geometryExtended2017Plan1_xmlwriter.py --geom=Extended2017Plan1FlatMinus05Percent --out=geFM05 || die 'failed geometryExtended2017Plan1_xmlwriter.py Extended2017Plan1FlatMinus05Percent' $?
+
+#sed -i '{s/Extended2017Plan1FlatMinus05Percent/Extended2017Plan1FlatMinus10Percent/g}' geometryExtended2017Plan1_xmlwriter.py
+#sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2017Plan1_xmlwriter.py
+cmsRun geometryExtended2017Plan1_xmlwriter.py --geom=Extended2017Plan1FlatMinus10Percent --out=geFM10 || die 'failed geometryExtended2017Plan1_xmlwriter.py' $?
+
+#sed -i '{s/Extended2017Plan1FlatMinus10Percent/Extended2017Plan1FlatPlus05Percent/g}' geometryExtended2017Plan1_xmlwriter.py
+#sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2017Plan1_xmlwriter.py
+cmsRun geometryExtended2017Plan1_xmlwriter.py --geom=Extended2017Plan1FlatPlus05Percent --out=geFP05 || die 'failed geometryExtended2017Plan1_xmlwriter.py Extended2017Plan1FlatPlus05Percent' $?
+
+#sed -i '{s/Extended2017Plan1FlatPlus05Percent/Extended2017Plan1FlatPlus10Percent/g}' geometryExtended2017Plan1_xmlwriter.py
+#sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2017Plan1_xmlwriter.py
+cmsRun geometryExtended2017Plan1_xmlwriter.py --geom=Extended2017Plan1FlatPlus10Percent --out=geFP10 || die 'failed geometryExtended2017Plan1_xmlwriter.py' $?
 
 # Read the one big XML file and output a record to the
 # database with the an identifying tag
 # This is repeated several times below.  The sed commands
-# serve to give the following sequence of input file and output
+# serve to give the correct sequence of input file and output
 # tag
-#
+# To start:
 # Input file                Output tag
 # gezSingleBigFile.xml      XMLFILE_Geometry_${mytag}_Extended2017Plan1ZeroMaterial_mc
-#
-sed -i '{s/Extended/Extended2017Plan1ZeroMaterial/g}' xmlgeometrywriter.py
-sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
 
-sed -i '{s/Extended2017Plan1ZeroMaterial/Extended2017Plan1FlatMinus05Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended/Extended2017Plan1ZeroMaterial/g}' xmlgeometrywriter.py
+#sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2017Plan1ZeroMaterial --inPre=gez|| die 'failed xmlgeometrywriter.py Extended2017Plan1ZeroMaterial' $?
+
+#sed -i '{s/Extended2017Plan1ZeroMaterial/Extended2017Plan1FlatMinus05Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2017Plan1FlatMinus05Percent --inPre=geFM05 || die 'failed xmlgeometrywriter.py Extended2017Plan1FlatMinus05Percent' $?
 
-sed -i '{s/Extended2017Plan1FlatMinus05Percent/Extended2017Plan1FlatMinus10Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended2017Plan1FlatMinus05Percent/Extended2017Plan1FlatMinus10Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2017Plan1FlatMinus10Percent --inPre=geFM10 || die 'failed xmlgeometrywriter.py Extended2017Plan1FlatMinus10Percent' $?
 
-sed -i '{s/Extended2017Plan1FlatMinus10Percent/Extended2017Plan1FlatPlus05Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended2017Plan1FlatMinus10Percent/Extended2017Plan1FlatPlus05Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2017Plan1FlatPlus05Percent --inPre=geFP05 || die 'failed xmlgeometrywriter.py Extended2017Plan1FlatPlus05Percent' $?
 
-sed -i '{s/Extended2017Plan1FlatPlus05Percent/Extended2017Plan1FlatPlus10Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended2017Plan1FlatPlus05Percent/Extended2017Plan1FlatPlus10Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2017Plan1FlatPlus10Percent --inPre=geFP10 || die 'failed xmlgeometrywriter.py Extended2017Plan1FlatPlus10Percent' $?
 
 # All the database objects were written into one database
 # (myfile.db) in the steps above.  Extract the different
 # pieces into separate database files.  These are the payloads
-# that get uploaded to the dropbox.  There is one for each tag
+# that get uploaded to the DB.  There is one for each tag
 ./splitExtended2017Plan1Database.sh