Merge pull request cms-sw#83 from cms-l1t-offline/l1t-global-dev-upda…

…tes-proposed L1t global dev updates proposed
blwiner · Nov 6, 2015 · 2af92f1 · 2af92f1
2 parents a4ca603 + 00333c3
commit 2af92f1
Show file tree

Hide file tree

Showing 80 changed files with 54,227 additions and 792 deletions.
diff --git a/CondFormats/L1TObjects/interface/CaloParams.h b/CondFormats/L1TObjects/interface/CaloParams.h
@@ -255,7 +255,11 @@ namespace l1t {
     double egMaxPtHOverE() const {return egp_.maxPtHOverE_;}
     l1t::LUT* egMaxHOverELUT() { return &pnode_[egMaxHOverE].LUT_; }
     l1t::LUT* egCompressShapesLUT() { return &pnode_[egCompressShapes].LUT_; }
+
+    std::string egShapeIdType() const { return pnode_[egShapeId].type_; }
+    unsigned egShapeIdVersion() const { return pnode_[egShapeId].version_; }
     l1t::LUT* egShapeIdLUT() { return &pnode_[egShapeId].LUT_; }
+
     int egMinPtJetIsolation() const { return egp_.minPtJetIsolation_; }
     int egMaxPtJetIsolation() const { return egp_.maxPtJetIsolation_; }
     int egMinPtHOverEIsolation() const { return egp_.minPtHOverEIsolation_; }
@@ -268,10 +272,9 @@ namespace l1t {
     const std::vector<double> & egPUSParams() const { return pnode_[egPUS].dparams_; }
     double egPUSParam(int ipar) const { return pnode_[egPUS].dparams_.at(ipar); }
 
-
-
     l1t::LUT* egIsolationLUT() { return &pnode_[egIsolation].LUT_; }
     std::string egCalibrationType() const { return pnode_[egCalibration].type_; }
+    unsigned egCalibrationVersion() const { return pnode_[egCalibration].version_; }
     std::vector<double> egCalibrationParams() { return pnode_[egCalibration].dparams_; }
     l1t::LUT* egCalibrationLUT() { return &pnode_[egCalibration].LUT_; }
 
@@ -284,6 +287,8 @@ namespace l1t {
     void setEgMaxPtHOverE(double thresh) { egp_.maxPtHOverE_ = thresh;}
     void setEgMaxHOverELUT(const l1t::LUT & lut) { pnode_[egMaxHOverE].LUT_ = lut; }
     void setEgCompressShapesLUT(const l1t::LUT & lut) { pnode_[egCompressShapes].LUT_ = lut; }
+    void setEgShapeIdType(std::string type) { pnode_[egShapeId].type_ = type; }
+    void setEgShapeIdVersion(unsigned version) { pnode_[egShapeId].version_ = version; }
     void setEgShapeIdLUT(const l1t::LUT & lut) { pnode_[egShapeId].LUT_ = lut; }
     void setEgMinPtJetIsolation(int cutValue) { egp_.minPtJetIsolation_ = cutValue; }
     void setEgMaxPtJetIsolation(int cutValue) { egp_.maxPtJetIsolation_ = cutValue; }
@@ -297,6 +302,7 @@ namespace l1t {
     void setEgPUSParams(const std::vector<double> & params) { pnode_[egPUS].dparams_ = params; }
     void setEgIsolationLUT(const l1t::LUT & lut) { pnode_[egIsolation].LUT_ = lut; }
     void setEgCalibrationType(std::string type) { pnode_[egCalibration].type_ = type; }
+    void setEgCalibrationVersion(unsigned version) { pnode_[egCalibration].version_ = version; }
     void setEgCalibrationParams(std::vector<double> params) { pnode_[egCalibration].dparams_ = params; }
     void setEgCalibrationLUT(const l1t::LUT & lut) { pnode_[egCalibration].LUT_ = lut; }
 

diff --git a/Configuration/StandardSequences/python/RawToDigi_Data_cff.py b/Configuration/StandardSequences/python/RawToDigi_Data_cff.py
@@ -17,7 +17,8 @@
                          +muonRPCDigis
                          +castorDigis
                          +scalersRawToDigi
-                         +tcdsDigis)
+                         +tcdsDigis
+                         +caloStage2Digis)
 
 RawToDigi_woGCT = cms.Sequence(csctfDigis
                                +dttfDigis
@@ -33,7 +34,8 @@
                                +muonRPCDigis
                                +castorDigis
                                +scalersRawToDigi
-                               +tcdsDigis)
+                               +tcdsDigis
+                               +caloStage2Digis)
 
 ecalDigis.DoRegional = False
 

diff --git a/Configuration/StandardSequences/python/RawToDigi_cff.py b/Configuration/StandardSequences/python/RawToDigi_cff.py
@@ -53,6 +53,12 @@
 from EventFilter.Utilities.tcdsRawToDigi_cfi import *
 tcdsDigis = EventFilter.Utilities.tcdsRawToDigi_cfi.tcdsRawToDigi.clone()
 
+from EventFilter.L1TRawToDigi.caloStage1Digis_cfi import *
+caloStage1Digis = EventFilter.L1TRawToDigi.caloStage1Digis_cfi.caloStage1Digis.clone()
+
+from EventFilter.L1TRawToDigi.caloStage2Digis_cfi import *
+caloStage2Digis = EventFilter.L1TRawToDigi.caloStage2Digis_cfi.caloStage2Digis.clone()
+
 RawToDigi = cms.Sequence(csctfDigis
                          +dttfDigis
                          +gctDigis
@@ -68,7 +74,9 @@
                          +muonRPCDigis
                          +castorDigis
                          +scalersRawToDigi
-                         +tcdsDigis)
+                         +tcdsDigis
+#                         +caloStage1Digis
+                         +caloStage2Digis)
 
 RawToDigi_noTk = cms.Sequence(csctfDigis
                               +dttfDigis
@@ -83,7 +91,9 @@
                               +muonRPCDigis
                               +castorDigis
                               +scalersRawToDigi
-                              +tcdsDigis)
+                              +tcdsDigis
+#                              +caloStage1Digis
+                              +caloStage2Digis)
 
 scalersRawToDigi.scalersInputTag = 'rawDataCollector'
 csctfDigis.producer = 'rawDataCollector'

diff --git a/DataFormats/FEDRawData/test/DumpFEDRawDataProduct.cc b/DataFormats/FEDRawData/test/DumpFEDRawDataProduct.cc
@@ -24,12 +24,12 @@ namespace test{
   class DumpFEDRawDataProduct: public EDAnalyzer{
   private:
     std::set<int> FEDids_;
-    std::string label_;
+    edm::EDGetTokenT<FEDRawDataCollection> token_;
     bool dumpPayload_;
   public:
     DumpFEDRawDataProduct(const ParameterSet& pset){
       std::vector<int> ids;
-      label_ = pset.getUntrackedParameter<std::string>("label","source");
+      token_ = consumes<FEDRawDataCollection>(pset.getUntrackedParameter<edm::InputTag>("token"));
       ids=pset.getUntrackedParameter<std::vector<int> >("feds",std::vector<int>());
       dumpPayload_=pset.getUntrackedParameter<bool>("dumpPayload",false);
       for (std::vector<int>::iterator i=ids.begin(); i!=ids.end(); i++) 
@@ -41,7 +41,7 @@ namespace test{
       cout << "--- Run: " << e.id().run()
 	   << " Event: " << e.id().event() << endl;
       Handle<FEDRawDataCollection> rawdata;
-      e.getByLabel(label_,rawdata);
+      e.getByToken(token_,rawdata);
       for (int i = 0; i<=FEDNumbering::lastFEDId(); i++){
 	const FEDRawData& data = rawdata->FEDData(i);
 	size_t size=data.size();