[91X] Replace TMatrix by Eigen matrices and various fixes in MillePede workflow

Alignment/CommonAlignment/plugins/APVModeFilter.cc

@@ -101,6 +101,10 @@ constexpr APVModeFilter::BitMask APVModeFilter::multi_;
 //
 APVModeFilter::APVModeFilter(const edm::ParameterSet& iConfig) :
   mode_(convertMode(iConfig.getUntrackedParameter<std::string>("apvMode"))) {
+  edm::LogInfo("Alignment")
+    << "@SUB=APVModeFilter::APVModeFilter"
+    << "Selecting events with APV mode '"
+    << iConfig.getUntrackedParameter<std::string>("apvMode") << "'.";
 }
 
 

Alignment/CommonAlignment/python/tools/trackselectionRefitting.py

@@ -6,7 +6,7 @@
 def getSequence(process, collection,
                 saveCPU = False,
                 TTRHBuilder = "WithAngleAndTemplate",
-                usePixelQualityFlag = True,
+                usePixelQualityFlag = None,
                 openMassWindow = False,
                 cosmicsDecoMode = False,
                 cosmicsZeroTesla = True,
@@ -16,7 +16,7 @@ def getSequence(process, collection,
     subsequent processing steps.
     The modules in the sequence are already attached to the given `process`
     object using the given track collection `collection` and the given
-    optionial arguments.
+    optional arguments.
 
     Arguments:
     - `process`: 'cms.Process' object to which the modules of the sequence will
@@ -27,6 +27,11 @@ def getSequence(process, collection,
                  This option is currently not recommended.
     - `TTRHBuilder`: Option used for the Track(Re)Fitter modules.
     - `usePixelQualityFlag`: Option used for the TrackHitFilter module.
+                             Defaults to 'True' but is automatically set to
+                             'False' if a `TTRHBuilder` without templates is
+                             used.
+                             If this is still wanted for some reason, one can
+                             explicitely specify it as 'True'.
     - `openMassWindow`: Used to configure the TwoBodyDecaySelector for ZMuMu.
     - `cosmicsDecoMode`: If set to 'True' a lower Signal/Noise cut is used.
     - `cosmicsZeroTesla`: If set to 'True' a 0T-specific selection is used.
@@ -35,6 +40,18 @@ def getSequence(process, collection,
                             to provide here the name of the constraint module.
     """
 
+    ###################################################
+    # resolve default values incl. consistency checks #
+    ###################################################
+
+    if usePixelQualityFlag is None:
+        if "Template" not in TTRHBuilder:
+            usePixelQualityFlag = False # not defined without templates
+            print "Using 'TTRHBuilder' without templates:", TTRHBuilder
+            print " --> Turning off pixel quality flag in hit filter."
+        else:
+            usePixelQualityFlag = True # default for usage with templates
+
 
     #############################
     ## setting general options ##
@@ -55,7 +72,7 @@ def getSequence(process, collection,
     options["TrackSelector"]["Alignment"] = {
         "filter": True,
         "pMin": 3.0,
-        "nHitMin2D": 2,        
+        "nHitMin2D": 2,
         "d0Min": -50.0,
         "d0Max": 50.0,
         "etaMin": -3.0,
@@ -65,6 +82,7 @@ def getSequence(process, collection,
         }
     options["TrackRefitter"]["First"] = {
         "NavigationSchool": "",
+        "TTRHBuilder": TTRHBuilder
         }
     options["TrackRefitter"]["Second"] = {
         "NavigationSchool": "",
@@ -93,7 +111,8 @@ def getSequence(process, collection,
     #########################################
     isCosmics = False
 
-    if collection == "ALCARECOTkAlMinBias" or collection == "generalTracks" or collection == "ALCARECOTkAlMinBiasHI" or collection == "hiGeneralTracks":
+    if collection in ("ALCARECOTkAlMinBias", "generalTracks",
+                      "ALCARECOTkAlMinBiasHI", "hiGeneralTracks"):
         options["TrackSelector"]["Alignment"].update({
                 "ptMin": 1.0,
                 "pMin": 8.,
@@ -124,15 +143,19 @@ def getSequence(process, collection,
                 "applyMultiplicityFilter": True,
                 "maxMultiplicity": 1
                 })
-    elif collection == "ALCARECOTkAlMuonIsolated" or collection == "ALCARECOTkAlMuonIsolatedHI" or collection == "ALCARECOTkAlMuonIsolatedPA":
+    elif collection in ("ALCARECOTkAlMuonIsolated",
+                        "ALCARECOTkAlMuonIsolatedHI",
+                        "ALCARECOTkAlMuonIsolatedPA"):
         options["TrackSelector"]["Alignment"].update({
                 ("minHitsPerSubDet", "inPIXEL"): 1,
                 "ptMin": 5.0,
                 "nHitMin": 10,
                 "applyMultiplicityFilter": True,
                 "maxMultiplicity": 1,
                 })
-    elif collection == "ALCARECOTkAlZMuMu" or collection == "ALCARECOTkAlZMuMuHI" or collection == "ALCARECOTkAlZMuMuPA":
+    elif collection in ("ALCARECOTkAlZMuMu",
+                        "ALCARECOTkAlZMuMuHI",
+                        "ALCARECOTkAlZMuMuPA"):
         options["TrackSelector"]["Alignment"].update({
                 "ptMin": 15.0,
                 "etaMin": -3.0,
@@ -201,7 +224,7 @@ def getSequence(process, collection,
                 ("TrackSelector", "Alignment", {"method": "load"}),
                 ("TrackRefitter", "Second", {"method": "load",
                                              "clone": True})]
-        if isCosmics: mods = mods[1:]
+        if isCosmics: mods = mods[1:] # skip high purity selector for cosmics
 
 
 
@@ -218,6 +241,13 @@ def getSequence(process, collection,
 
 
 
+    #######################################################
+    # load offline beam spot module required by the refit #
+    #######################################################
+    process.load("RecoVertex.BeamSpotProducer.BeamSpot_cff")
+
+
+
     ###############################
     ## put the sequence together ##
     ###############################
@@ -239,9 +269,9 @@ def getSequence(process, collection,
                          isCosmics = isCosmics, **(mods[-1][2]))
         modules.append(getattr(process, src))
 
-    moduleSum = modules[0]
-    for mod in modules[1:]:
-        moduleSum += mod
+    moduleSum = process.offlineBeamSpot        # first element of the sequence
+    for module in modules: moduleSum += module # append the other modules
+
     return cms.Sequence(moduleSum)
 
 

Alignment/CommonAlignmentMonitor/interface/AlignmentMonitorBase.h

@@ -61,7 +61,7 @@ class AlignmentMonitorBase
       void duringLoop(const edm::Event &iEvent, const edm::EventSetup &iSetup, const ConstTrajTrackPairCollection &iTrajTracks);
 
       /// Called at end of loop: don't reimplement
-      void endOfLoop(const edm::EventSetup &iSetup);
+      void endOfLoop();
 
       /// Called at end of processing: don't implement
       void endOfJob() {}
@@ -76,7 +76,7 @@ class AlignmentMonitorBase
 
       /// Called after updating AlignableTracker and AlignableMuon (by
       /// "endOfLoop()"): may be reimplemented
-      virtual void afterAlignment(const edm::EventSetup &iSetup) { }
+      virtual void afterAlignment() { }
 
    protected:
       /// Use this every time you book a histogram (so that
@@ -111,6 +111,6 @@ class AlignmentMonitorBase
 };
 
 /*** Global typedefs ***/
-typedef std::vector<AlignmentMonitorBase*> AlignmentMonitors;
+using AlignmentMonitors = std::vector<std::unique_ptr<AlignmentMonitorBase> >;
 
 #endif

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc

@@ -85,7 +85,6 @@ class AlignmentMonitorAsAnalyzer : public edm::EDAnalyzer {
       AlignmentParameterStore *m_alignmentParameterStore;
 
       std::vector<AlignmentMonitorBase*> m_monitors;
-      const edm::EventSetup *m_lastSetup;
 
       bool m_firstEvent;
 };
@@ -219,8 +218,6 @@ AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSe
       (*monitor)->duringLoop(iEvent, iSetup, trajTracks);
    }
 
-   // Keep this for endOfLoop (why does endOfLoop want iSetup???)
-   m_lastSetup = &iSetup;
 }
 
 
@@ -236,7 +233,7 @@ void
 AlignmentMonitorAsAnalyzer::endJob() 
 {
    for (std::vector<AlignmentMonitorBase*>::const_iterator monitor = m_monitors.begin();  monitor != m_monitors.end();  ++monitor) {
-      (*monitor)->endOfLoop(*m_lastSetup);
+      (*monitor)->endOfLoop();
    }
    for (std::vector<AlignmentMonitorBase*>::const_iterator monitor = m_monitors.begin();  monitor != m_monitors.end();  ++monitor) {
       (*monitor)->endOfJob();

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorGeneric.h

@@ -43,10 +43,6 @@ class AlignmentMonitorGeneric:
 		     const ConstTrajTrackPairCollection&
 		     );
 
-  virtual void afterAlignment(
-			      const edm::EventSetup&
-			      ) {}
-
   private:
 
   static const unsigned int nBin_ = 50;

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc

@@ -38,7 +38,7 @@ class AlignmentMonitorMuonResiduals: public AlignmentMonitorBase {
 
       void book() override;
       void event(const edm::Event &iEvent, const edm::EventSetup &iSetup, const ConstTrajTrackPairCollection& iTrajTracks) override;
-      void afterAlignment(const edm::EventSetup &iSetup) override;
+      void afterAlignment() override;
 
    private:
       std::map<int, int> m_numx;
@@ -820,7 +820,7 @@ void AlignmentMonitorMuonResiduals::event(const edm::Event &iEvent, const edm::E
    } // end loop over track-trajectories
 }
 
-void AlignmentMonitorMuonResiduals::afterAlignment(const edm::EventSetup &iSetup) {
+void AlignmentMonitorMuonResiduals::afterAlignment() {
    std::vector<Alignable*> chambers;
    std::vector<Alignable*> tmp1 = pMuon()->DTChambers();
    for (std::vector<Alignable*>::const_iterator iter = tmp1.begin();  iter != tmp1.end();  ++iter) chambers.push_back(*iter);

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc

@@ -42,7 +42,7 @@ class AlignmentMonitorMuonSystemMap1D: public AlignmentMonitorBase
   void event(const edm::Event &iEvent, const edm::EventSetup &iSetup, const ConstTrajTrackPairCollection& iTrajTracks) override;
   void processMuonResidualsFromTrack(MuonResidualsFromTrack &mrft, const edm::Event &iEvent);
 
-  void afterAlignment(const edm::EventSetup &iSetup) override;
+  void afterAlignment() override;
 
 private:
 
@@ -480,7 +480,7 @@ void AlignmentMonitorMuonSystemMap1D::processMuonResidualsFromTrack(MuonResidual
 }
 
 
-void AlignmentMonitorMuonSystemMap1D::afterAlignment(const edm::EventSetup &iSetup)
+void AlignmentMonitorMuonSystemMap1D::afterAlignment()
 {
   std::cout << "AlignmentMonitorMuonSystemMap1D counters:"<<std::endl;
   std::cout << " monitor m_counter_event      = " << m_counter_event << std::endl;

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc

@@ -42,8 +42,6 @@ class AlignmentMonitorMuonVsCurvature: public AlignmentMonitorBase
   void event(const edm::Event &iEvent, const edm::EventSetup &iSetup, const ConstTrajTrackPairCollection& iTrajTracks) override;
   void processMuonResidualsFromTrack(MuonResidualsFromTrack &mrft, const Trajectory* traj = NULL);
 
-  void afterAlignment(const edm::EventSetup &iSetup) override {}
-
 private:
 
   edm::InputTag m_muonCollectionTag;

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc

@@ -42,8 +42,6 @@ class AlignmentMonitorSegmentDifferences: public AlignmentMonitorBase
   void event(const edm::Event &iEvent, const edm::EventSetup &iSetup, const ConstTrajTrackPairCollection& iTrajTracks) override;
   void processMuonResidualsFromTrack(MuonResidualsFromTrack &mrft);
 
-  void afterAlignment(const edm::EventSetup &iSetup) override {}
-
 private:
 
   edm::InputTag m_muonCollectionTag;

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTemplate.cc

@@ -32,7 +32,7 @@ class AlignmentMonitorTemplate: public AlignmentMonitorBase {
 
       void book() override;
       void event(const edm::Event &iEvent, const edm::EventSetup &iSetup, const ConstTrajTrackPairCollection& iTrajTracks) override;
-      void afterAlignment(const edm::EventSetup &iSetup) override;
+      void afterAlignment() override;
 
    private:
       TH1F *m_hist, *m_ihist, *m_otherdir, *m_otherdir2;
@@ -120,7 +120,7 @@ void AlignmentMonitorTemplate::event(const edm::Event &iEvent, const edm::EventS
    } // end loop over tracks/trajectories
 }
 
-void AlignmentMonitorTemplate::afterAlignment(const edm::EventSetup &iSetup) {
+void AlignmentMonitorTemplate::afterAlignment() {
    m_otherdir->Fill(iteration());  // this one will only get one fill per iteration, because it's called in afterAlignment()
 }
 

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTracksFromTrajectories.cc

@@ -39,7 +39,7 @@ class AlignmentMonitorTracksFromTrajectories: public AlignmentMonitorBase {
 
       void book();
       void event(const edm::Event &iEvent, const edm::EventSetup &iSetup, const ConstTrajTrackPairCollection& iTrajTracks);
-      void afterAlignment(const edm::EventSetup &iSetup);
+      void afterAlignment();
 
    private:
       MuonServiceProxy *theMuonServiceProxy;
@@ -260,7 +260,7 @@ void AlignmentMonitorTracksFromTrajectories::event(const edm::Event &iEvent, con
 // afterAlignment()
 //////////////////////////////////////////////////////////////////////
 
-void AlignmentMonitorTracksFromTrajectories::afterAlignment(const edm::EventSetup &iSetup) {
+void AlignmentMonitorTracksFromTrajectories::afterAlignment() {
 }
 
 //

Alignment/CommonAlignmentMonitor/src/AlignmentMonitorBase.cc

@@ -62,9 +62,9 @@ void AlignmentMonitorBase::duringLoop(const edm::Event &iEvent, const edm::Event
 }
 
 
-void AlignmentMonitorBase::endOfLoop(const edm::EventSetup &iSetup)
+void AlignmentMonitorBase::endOfLoop()
 {
-   afterAlignment(iSetup);
+   afterAlignment();
 }
 
 

Alignment/CommonAlignmentProducer/BuildFile.xml

@@ -1,3 +1,13 @@
+<use   name="Alignment/CommonAlignment"/>
+<use   name="Alignment/CommonAlignmentAlgorithm"/>
+<use   name="Alignment/CommonAlignmentMonitor"/>
+<use   name="Alignment/CommonAlignmentParametrization"/>
+<use   name="Alignment/MuonAlignment"/>
+<use   name="Alignment/TrackerAlignment"/>
+<use   name="CondCore/DBOutputService"/>
+<use   name="CondFormats/Alignment"/>
+<use   name="CondFormats/AlignmentRecord"/>
+<use   name="CondFormats/GeometryObjects"/>
 <use   name="DataFormats/MuonDetId"/>
 <use   name="DataFormats/SiStripDetId"/>
 <use   name="DataFormats/SiPixelDetId"/>
@@ -14,6 +24,7 @@
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/Utilities"/>
 <use   name="FWCore/ParameterSet"/>
+<use   name="FWCore/ServiceRegistry"/>
 <use   name="DataFormats/Alignment"/>
 <use   name="Geometry/Records"/>
 <use   name="Geometry/TrackerGeometryBuilder"/>