Merge pull request #11 from cms-sw/master

Update master

Alignment/CommonAlignmentProducer/plugins/AlignmentCSCBeamHaloSelectorModule.cc

@@ -1,7 +1,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h"
 
 // the following include is necessary to clone all track branches
@@ -37,6 +37,6 @@ struct CSCBeamHaloConfigSelector {
   AlignmentCSCBeamHaloSelector theSelector;
 };
 
-typedef ObjectSelectorStream<CSCBeamHaloConfigSelector> AlignmentCSCBeamHaloSelectorModule;
+typedef ObjectSelector<CSCBeamHaloConfigSelector> AlignmentCSCBeamHaloSelectorModule;
 
 DEFINE_FWK_MODULE(AlignmentCSCBeamHaloSelectorModule);

Alignment/CommonAlignmentProducer/plugins/AlignmentCSCOverlapSelectorModule.cc

@@ -1,7 +1,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h"
 
 // the following include is necessary to clone all track branches
@@ -35,6 +35,6 @@ struct CSCOverlapConfigSelector {
   AlignmentCSCOverlapSelector theSelector;
 };
 
-typedef ObjectSelectorStream<CSCOverlapConfigSelector> AlignmentCSCOverlapSelectorModule;
+typedef ObjectSelector<CSCOverlapConfigSelector> AlignmentCSCOverlapSelectorModule;
 
 DEFINE_FWK_MODULE(AlignmentCSCOverlapSelectorModule);

Alignment/CommonAlignmentProducer/plugins/AlignmentCSCTrackSelectorModule.cc

@@ -1,7 +1,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 
 //the selectores used to select the tracks
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCTrackSelector.h"
@@ -39,6 +39,6 @@ struct CSCTrackConfigSelector {
   AlignmentCSCTrackSelector theBaseSelector;
 };
 
-typedef ObjectSelectorStream<CSCTrackConfigSelector> AlignmentCSCTrackSelectorModule;
+typedef ObjectSelector<CSCTrackConfigSelector> AlignmentCSCTrackSelectorModule;
 
 DEFINE_FWK_MODULE(AlignmentCSCTrackSelectorModule);

Alignment/CommonAlignmentProducer/plugins/AlignmentMuonSelectorModule.cc

@@ -14,7 +14,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentMuonSelector.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
@@ -48,6 +48,6 @@ struct MuonConfigSelector {
   AlignmentMuonSelector theSelector;
 };
 
-typedef ObjectSelectorStream<MuonConfigSelector> AlignmentMuonSelectorModule;
+typedef ObjectSelector<MuonConfigSelector> AlignmentMuonSelectorModule;
 
 DEFINE_FWK_MODULE(AlignmentMuonSelectorModule);

Alignment/CommonAlignmentProducer/plugins/AlignmentTrackSelectorModule.cc

@@ -1,7 +1,7 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 
 //the selectores used to select the tracks
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentTrackSelector.h"
@@ -60,6 +60,6 @@ struct TrackConfigSelector {
   AlignmentTwoBodyDecayTrackSelector theTwoBodyDecaySelector;
 };
 
-typedef ObjectSelectorStream<TrackConfigSelector> AlignmentTrackSelectorModule;
+typedef ObjectSelector<TrackConfigSelector> AlignmentTrackSelectorModule;
 
 DEFINE_FWK_MODULE(AlignmentTrackSelectorModule);

Alignment/CommonAlignmentProducer/plugins/AlignmentTracksFromVertexSelectorModule.cc

@@ -1,6 +1,6 @@
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
+#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 
 //the selectores used to select the tracks
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentTracksFromVertexSelector.h"
@@ -32,10 +32,10 @@ struct TrackFromVertexConfigSelector {
   AlignmentTrackFromVertexSelector theBaseSelector;
 };
 
-class AlignmentTrackFromVertexSelectorModule : public ObjectSelectorStream<TrackFromVertexConfigSelector> {
+class AlignmentTrackFromVertexSelectorModule : public ObjectSelector<TrackFromVertexConfigSelector> {
 public:
   AlignmentTrackFromVertexSelectorModule(const edm::ParameterSet &ps)
-      : ObjectSelectorStream<TrackFromVertexConfigSelector>(ps) {}
+      : ObjectSelector<TrackFromVertexConfigSelector>(ps) {}
   static void fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
     edm::ParameterSetDescription desc;
     desc.setComment("Alignment Tracks Selector from Vertices");

Alignment/TrackerAlignment/plugins/CreateTrackerAlignmentRcds.cc

@@ -386,9 +386,9 @@ void CreateIdealTkAlRecords::writeToDB() {
   }
 
   edm::LogInfo("Alignment") << "Writing ideal tracker-alignment records.";
-  poolDb->writeOne(&alignments_, since, "TrackerAlignmentRcd");
-  poolDb->writeOne(&alignmentErrors_, since, "TrackerAlignmentErrorExtendedRcd");
-  poolDb->writeOne(&alignmentSurfaceDeformations_, since, "TrackerSurfaceDeformationRcd");
+  poolDb->writeOneIOV(alignments_, since, "TrackerAlignmentRcd");
+  poolDb->writeOneIOV(alignmentErrors_, since, "TrackerAlignmentErrorExtendedRcd");
+  poolDb->writeOneIOV(alignmentSurfaceDeformations_, since, "TrackerSurfaceDeformationRcd");
 }
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------

Alignment/TrackerAlignment/plugins/MCMisalignmentScaler.cc

@@ -226,7 +226,7 @@ void MCMisalignmentScaler::analyze(const edm::Event&, const edm::EventSetup& iSe
   }
   edm::LogInfo("Alignment") << "Writing rescaled tracker-alignment record.";
   const auto& since = cond::timeTypeSpecs[cond::runnumber].beginValue;
-  poolDb->writeOne(&rescaledAlignments, since, "TrackerAlignmentRcd");
+  poolDb->writeOneIOV(rescaledAlignments, since, "TrackerAlignmentRcd");
 }
 
 MCMisalignmentScaler::ScalerMap MCMisalignmentScaler::decodeSubDetectors(const edm::VParameterSet& psets) {

CUDADataFormats/HGCal/interface/HGCUncalibRecHitsToRecHitsConstants.h

@@ -2,6 +2,7 @@
 #define CUDADataFormats_HGCal_HGCUncalibRecHitsToRecHitsConstants_h
 
 #include <cstdint>
+#include <cstddef>
 #include <vector>
 
 class HGCConstantVectorData {

CUDADataFormats/SiPixelCluster/interface/SiPixelClustersCUDA.h

@@ -18,9 +18,13 @@ class SiPixelClustersCUDA {
   SiPixelClustersCUDA(SiPixelClustersCUDA &&) = default;
   SiPixelClustersCUDA &operator=(SiPixelClustersCUDA &&) = default;
 
-  void setNClusters(uint32_t nClusters) { nClusters_h = nClusters; }
+  void setNClusters(uint32_t nClusters, int32_t offsetBPIX2) {
+    nClusters_h = nClusters;
+    offsetBPIX2_h = offsetBPIX2;
+  }
 
   uint32_t nClusters() const { return nClusters_h; }
+  int32_t offsetBPIX2() const { return offsetBPIX2_h; }
 
   uint32_t *moduleStart() { return moduleStart_d.get(); }
   uint32_t *clusInModule() { return clusInModule_d.get(); }
@@ -58,6 +62,7 @@ class SiPixelClustersCUDA {
   cms::cuda::device::unique_ptr<DeviceConstView> view_d;  // "me" pointer
 
   uint32_t nClusters_h = 0;
+  int32_t offsetBPIX2_h = 0;
 };
 
 #endif  // CUDADataFormats_SiPixelCluster_interface_SiPixelClustersCUDA_h

CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DHeterogeneous.h

@@ -16,6 +16,7 @@ class TrackingRecHit2DHeterogeneous {
 
   explicit TrackingRecHit2DHeterogeneous(
       uint32_t nHits,
+      int32_t offsetBPIX2,
       pixelCPEforGPU::ParamsOnGPU const* cpeParams,
       uint32_t const* hitsModuleStart,
       cudaStream_t stream,
@@ -32,6 +33,7 @@ class TrackingRecHit2DHeterogeneous {
   TrackingRecHit2DSOAView const* view() const { return m_view.get(); }
 
   auto nHits() const { return m_nHits; }
+  auto offsetBPIX2() const { return m_offsetBPIX2; }
 
   auto hitsModuleStart() const { return m_hitsModuleStart; }
   auto hitsLayerStart() { return m_hitsLayerStart; }
@@ -60,6 +62,7 @@ class TrackingRecHit2DHeterogeneous {
   unique_ptr<TrackingRecHit2DSOAView> m_view;  //!
 
   uint32_t m_nHits;
+  int32_t m_offsetBPIX2;
 
   uint32_t const* m_hitsModuleStart;  // needed for legacy, this is on GPU!
 
@@ -80,11 +83,12 @@ using TrackingRecHit2DHost = TrackingRecHit2DHeterogeneous<cms::cudacompat::Host
 template <typename Traits>
 TrackingRecHit2DHeterogeneous<Traits>::TrackingRecHit2DHeterogeneous(
     uint32_t nHits,
+    int32_t offsetBPIX2,
     pixelCPEforGPU::ParamsOnGPU const* cpeParams,
     uint32_t const* hitsModuleStart,
     cudaStream_t stream,
     TrackingRecHit2DHeterogeneous<cms::cudacompat::GPUTraits> const* input)
-    : m_nHits(nHits), m_hitsModuleStart(hitsModuleStart) {
+    : m_nHits(nHits), m_offsetBPIX2(offsetBPIX2), m_hitsModuleStart(hitsModuleStart) {
   auto view = Traits::template make_host_unique<TrackingRecHit2DSOAView>(stream);
 
   view->m_nHits = nHits;

CUDADataFormats/TrackingRecHit/test/TrackingRecHit2DCUDA_t.cpp

@@ -18,11 +18,11 @@ int main() {
   auto nHits = 200;
   // inner scope to deallocate memory before destroying the stream
   {
-    TrackingRecHit2DGPU tkhit(nHits, nullptr, nullptr, stream);
+    TrackingRecHit2DGPU tkhit(nHits, 0, nullptr, nullptr, stream);
 
     testTrackingRecHit2D::runKernels(tkhit.view());
 
-    TrackingRecHit2DHost tkhitH(nHits, nullptr, nullptr, stream, &tkhit);
+    TrackingRecHit2DHost tkhitH(nHits, 0, nullptr, nullptr, stream, &tkhit);
     cudaStreamSynchronize(stream);
     assert(tkhitH.view());
     assert(tkhitH.view()->nHits() == unsigned(nHits));

CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstants.cc

@@ -54,12 +54,11 @@ void WriteEcalMiscalibConstants::analyze(const edm::Event& iEvent, const edm::Ev
   if (poolDbService.isAvailable()) {
     if (poolDbService->isNewTagRequest(newTagRequest_)) {
       edm::LogVerbatim("WriteEcalMiscalibConstants") << "Creating a new IOV";
-      poolDbService->createNewIOV<const EcalIntercalibConstants>(*Mcal, poolDbService->beginOfTime(), newTagRequest_);
+      poolDbService->createOneIOV<const EcalIntercalibConstants>(*Mcal, poolDbService->beginOfTime(), newTagRequest_);
       edm::LogVerbatim("WriteEcalMiscalibConstants") << "Done";
     } else {
       edm::LogVerbatim("WriteEcalMiscalibConstants") << "Old IOV";
-      poolDbService->appendSinceTime<const EcalIntercalibConstants>(
-          *Mcal, poolDbService->currentTime(), newTagRequest_);
+      poolDbService->appendOneIOV<const EcalIntercalibConstants>(*Mcal, poolDbService->currentTime(), newTagRequest_);
     }
   }
 }

CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstantsMC.cc

@@ -54,12 +54,11 @@ void WriteEcalMiscalibConstantsMC::analyze(const edm::Event& iEvent, const edm::
   if (poolDbService.isAvailable()) {
     if (poolDbService->isNewTagRequest(newTagRequest_)) {
       edm::LogVerbatim("WriteEcalMiscalibConstantsMC") << "Creating a new IOV";
-      poolDbService->createNewIOV<const EcalIntercalibConstantsMC>(*Mcal, poolDbService->beginOfTime(), newTagRequest_);
+      poolDbService->createOneIOV<const EcalIntercalibConstantsMC>(*Mcal, poolDbService->beginOfTime(), newTagRequest_);
       edm::LogVerbatim("WriteEcalMiscalibConstantsMC") << "Done";
     } else {
       edm::LogVerbatim("WriteEcalMiscalibConstantsMC") << "Old IOV";
-      poolDbService->appendSinceTime<const EcalIntercalibConstantsMC>(
-          *Mcal, poolDbService->currentTime(), newTagRequest_);
+      poolDbService->appendOneIOV<const EcalIntercalibConstantsMC>(*Mcal, poolDbService->currentTime(), newTagRequest_);
     }
   }
 }

CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRun.h

@@ -530,7 +530,7 @@ class TEcnaRun : public TObject {
 
   //...................................................... methods that will (should) be private
 
-  void Init();
+  void Init(TEcnaObject*);
 
   void SetEcalSubDetector(const TString&);
 

CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRun.cc

@@ -27,28 +27,7 @@ TEcnaRun::TEcnaRun(TEcnaObject* pObjectManager, const TString& SubDet) {
 
   // std::cout << "[Info Management] CLASS: TEcnaRun.           CREATE OBJECT: this = " << this << std::endl;
 
-  Init();
-  fObjectManager = (TEcnaObject*)pObjectManager;
-  Long_t i_this = (Long_t)this;
-  pObjectManager->RegisterPointer("TEcnaRun", i_this);
-
-  //............................ fCnaParCout
-  fCnaParCout = nullptr;
-  Long_t iCnaParCout = pObjectManager->GetPointerValue("TEcnaParCout");
-  if (iCnaParCout == 0) {
-    fCnaParCout = new TEcnaParCout(pObjectManager); /*fCnew++*/
-  } else {
-    fCnaParCout = (TEcnaParCout*)iCnaParCout;
-  }
-
-  //............................ fCnaParPaths
-  fCnaParPaths = nullptr;
-  Long_t iCnaParPaths = pObjectManager->GetPointerValue("TEcnaParPaths");
-  if (iCnaParPaths == 0) {
-    fCnaParPaths = new TEcnaParPaths(pObjectManager); /*fCnew++*/
-  } else {
-    fCnaParPaths = (TEcnaParPaths*)iCnaParPaths;
-  }
+  Init(pObjectManager);
 
   //fCfgResultsRootFilePath    = fCnaParPaths->ResultsRootFilePath();
   //fCfgHistoryRunListFilePath = fCnaParPaths->HistoryRunListFilePath();
@@ -76,31 +55,7 @@ TEcnaRun::TEcnaRun(TEcnaObject* pObjectManager, const TString& SubDet) {
 }
 
 TEcnaRun::TEcnaRun(TEcnaObject* pObjectManager, const TString& SubDet, const Int_t& NbOfSamples) {
-  //fCnaParPaths = 0; fCnaParPaths = new TEcnaParPaths();  //fCnew++;
-  //fCnaParCout = 0;  fCnaParCout  = new TEcnaParCout();   //fCnew++;
-
-  Init();
-  fObjectManager = (TEcnaObject*)pObjectManager;
-  Long_t i_this = (Long_t)this;
-  pObjectManager->RegisterPointer("TEcnaRun", i_this);
-
-  //............................ fCnaParCout
-  fCnaParCout = nullptr;
-  Long_t iCnaParCout = pObjectManager->GetPointerValue("TEcnaParCout");
-  if (iCnaParCout == 0) {
-    fCnaParCout = new TEcnaParCout(pObjectManager); /*fCnew++*/
-  } else {
-    fCnaParCout = (TEcnaParCout*)iCnaParCout;
-  }
-
-  //............................ fCnaParPaths
-  fCnaParPaths = nullptr;
-  Long_t iCnaParPaths = pObjectManager->GetPointerValue("TEcnaParPaths");
-  if (iCnaParPaths == 0) {
-    fCnaParPaths = new TEcnaParPaths(pObjectManager); /*fCnew++*/
-  } else {
-    fCnaParPaths = (TEcnaParPaths*)iCnaParPaths;
-  }
+  Init(pObjectManager);
 
   //fCfgResultsRootFilePath    = fCnaParPaths->ResultsRootFilePath();
   //fCfgHistoryRunListFilePath = fCnaParPaths->HistoryRunListFilePath();
@@ -131,7 +86,7 @@ TEcnaRun::TEcnaRun(TEcnaObject* pObjectManager, const TString& SubDet, const Int
 //.... return true or false according to the existence of the path. The path itself is in an attribute of fCnaParPaths.
 Bool_t TEcnaRun::GetPathForResults() { return fCnaParPaths->GetPathForResultsRootFiles(); }
 
-void TEcnaRun::Init() {
+void TEcnaRun::Init(TEcnaObject* pObjectManager) {
   //Initialisation
 
   fCnew = 0;
@@ -245,6 +200,25 @@ void TEcnaRun::Init() {
   fTagAvMeanCorss = nullptr;
   fTagAvSigCorss = nullptr;
 
+  fObjectManager = (TEcnaObject*)pObjectManager;
+  pObjectManager->RegisterPointer("TEcnaRun", (Long_t)this);
+
+  //............................ fCnaParCout
+  Long_t iCnaParCout = pObjectManager->GetPointerValue("TEcnaParCout");
+  if (iCnaParCout == 0) {
+    fCnaParCout = new TEcnaParCout(pObjectManager); /*fCnew++*/
+  } else {
+    fCnaParCout = (TEcnaParCout*)iCnaParCout;
+  }
+
+  //............................ fCnaParPaths
+  Long_t iCnaParPaths = pObjectManager->GetPointerValue("TEcnaParPaths");
+  if (iCnaParPaths == 0) {
+    fCnaParPaths = new TEcnaParPaths(pObjectManager); /*fCnew++*/
+  } else {
+    fCnaParPaths = (TEcnaParPaths*)iCnaParPaths;
+  }
+
   //................................................... Code Print  ( Init() )
   fCodePrintNoComment = fCnaParCout->GetCodePrint("NoComment");
   fCodePrintWarnings = fCnaParCout->GetCodePrint("Warnings ");  // => default value

CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaWrite.cc

@@ -51,6 +51,7 @@ TEcnaWrite::TEcnaWrite(TEcnaObject* pObjectManager, const TString& SubDet) {
   } else {
     fCnaParCout = (TEcnaParCout*)iCnaParCout;
   }
+  fCodePrintAllComments = fCnaParCout->GetCodePrint("AllComments");
 
   //............................ fCnaParPaths
   fCnaParPaths = nullptr;
@@ -118,6 +119,7 @@ TEcnaWrite::TEcnaWrite(const TString& SubDet,
   } else {
     fCnaParCout = (TEcnaParCout*)pCnaParCout;
   }
+  fCodePrintAllComments = fCnaParCout->GetCodePrint("AllComments");
 
   fEcal = nullptr;
   if (pEcal == nullptr) {
@@ -194,8 +196,6 @@ void TEcnaWrite::Init() {
 
   fjustap_2d_ss = nullptr;
   fjustap_1d_ss = nullptr;
-
-  fCodePrintAllComments = fCnaParCout->GetCodePrint("AllComments");
 }
 // end of Init()
 

CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc

@@ -834,6 +834,10 @@ std::unique_ptr<HcalTPChannelParameters> HcalHardcodeCalibrations::produceTPChan
   auto result = std::make_unique<HcalTPChannelParameters>(&topo);
   const std::vector<HcalGenericDetId>& cells = allCells(topo, dbHardcode.killHE());
   for (auto cell : cells) {
+    // Thinking about Phase2 and the new FIR filter,
+    // for now, don't put TT in TPChannelParams
+    if (cell.subdetId() == HcalTriggerTower)
+      continue;
     HcalTPChannelParameter item = dbHardcode.makeHardcodeTPChannelParameter(cell);
     result->addValues(item);
   }

CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h

@@ -43,6 +43,7 @@ class HcaluLUTTPGCoder : public HcalTPGCoder {
   void adc2Linear(const HFDataFrame& df, IntegerCaloSamples& ics) const override;
   void adc2Linear(const QIE10DataFrame& df, IntegerCaloSamples& ics) const override;
   void adc2Linear(const QIE11DataFrame& df, IntegerCaloSamples& ics) const override;
+  std::vector<unsigned short> group0FGbits(const QIE11DataFrame& df) const;
   void compress(const IntegerCaloSamples& ics,
                 const std::vector<bool>& featureBits,
                 HcalTriggerPrimitiveDigi& tp) const override;