Change in AlignmentProducer for dealing with the new ClusterFlag (for…

… Skim and Prescale alignment workflow)
cms-sw · Oct 2, 2009 · 21c0dbe · 21c0dbe
1 parent bb5f88c
commit 21c0dbe
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/Alignment/CommonAlignmentProducer/BuildFile b/Alignment/CommonAlignmentProducer/BuildFile
@@ -17,6 +17,8 @@
 <use name=FWCore/Framework>
 <use name=FWCore/Utilities>
 <use name=FWCore/ParameterSet>
+<use name=DataFormats/Alignment>
+<use name=DataFormats/LaserAlignment>
 <use name=rootcore>
 <use name=root>
 <export>

diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc
@@ -1,8 +1,8 @@
 /// \file AlignmentProducer.cc
 ///
 ///  \author    : Frederic Ronga
-///  Revision   : $Revision: 1.34 $
-///  last update: $Date: 2009/05/11 12:29:00 $
+///  Revision   : $Revision: 1.35 $
+///  last update: $Date: 2009/06/23 10:02:58 $
 ///  by         : $Author: flucke $
 
 #include "AlignmentProducer.h"
@@ -84,7 +84,8 @@ AlignmentProducer::AlignmentProducer(const edm::ParameterSet& iConfig) :
   useSurvey_( iConfig.getParameter<bool>("useSurvey") ),
   tjTkAssociationMapTag_(iConfig.getParameter<edm::InputTag>("tjTkAssociationMapTag")),
   beamSpotTag_(iConfig.getParameter<edm::InputTag>("beamSpotTag")),
-  tkLasBeamTag_(iConfig.getParameter<edm::InputTag>("tkLasBeamTag"))
+  tkLasBeamTag_(iConfig.getParameter<edm::InputTag>("tkLasBeamTag")),
+  hitVMTag_(iConfig.getParameter<edm::InputTag>("HitPrescaleMap"))
 {
 
   edm::LogInfo("Alignment") << "@SUB=AlignmentProducer::AlignmentProducer";
@@ -399,8 +400,19 @@ AlignmentProducer::duringLoop( const edm::Event& event,
     event.getByLabel(beamSpotTag_, beamSpot);
 
     // Run the alignment algorithm with its input
-    const AlignmentAlgorithmBase::EventInfo eventInfo(event.id(), trajTracks, *beamSpot);
-    theAlignmentAlgo->run(setup, eventInfo);
+    if(hitVMTag_.encode().size()){//check that the input tag is not empty
+      edm::Handle<AliClusterValueMap> hitVM;
+      event.getByLabel(hitVMTag_, hitVM);
+      const AlignmentAlgorithmBase::EventInfo eventInfo(event.id(), trajTracks, *beamSpot, &(*hitVM));
+      theAlignmentAlgo->run(setup, eventInfo   );
+    }
+    else{
+      const AlignmentAlgorithmBase::EventInfo eventInfo(event.id(), trajTracks, *beamSpot, 0);
+      theAlignmentAlgo->run(setup, eventInfo  );
+    }
+
+    //    const AlignmentAlgorithmBase::EventInfo eventInfo(event.id(), trajTracks, *beamSpot);
+    //  theAlignmentAlgo->run(setup, eventInfo);
 
     for (std::vector<AlignmentMonitorBase*>::const_iterator monitor = theMonitors.begin();
 	 monitor != theMonitors.end();  ++monitor) {

diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.h b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.h
@@ -7,8 +7,8 @@
 /// Description : calls alignment algorithms
 ///
 ///  \author    : Frederic Ronga
-///  Revision   : $Revision: 1.14 $
-///  last update: $Date: 2009/05/11 09:31:38 $
+///  Revision   : $Revision: 1.15 $
+///  last update: $Date: 2009/06/23 10:03:01 $
 ///  by         : $Author: flucke $
 
 #include <vector>
@@ -160,6 +160,8 @@ class AlignmentProducer : public edm::ESProducerLooper
   const edm::InputTag tjTkAssociationMapTag_; // map with tracks/trajectories
   const edm::InputTag beamSpotTag_;           // beam spot
   const edm::InputTag tkLasBeamTag_;          // LAS beams in edm::Run (ignore if empty)
+  const edm::InputTag hitVMTag_;              // ValueMap containing associtaion cluster - flag
+
 
   // ESWatcher
   edm::ESWatcher<TrackerSurveyRcd> watchTkSurveyRcd_;

diff --git a/Alignment/CommonAlignmentProducer/plugins/BuildFile b/Alignment/CommonAlignmentProducer/plugins/BuildFile
@@ -2,6 +2,7 @@
 <use name=FWCore/Framework>
 <use name=FWCore/ParameterSet>
 
+
 # One library for the 'fake' AlignmentProducers. 
 # Do not put in same lib as AlignmentProducer since the latter
 # has many dependencies that should be avoided if only Fake is needed!
@@ -35,7 +36,7 @@
  <use name=TrackingTools/PatternTools>
  <use name=boost>
 </library>
-
+#
 
 # one library for the selector modules
 <library name=CommonAlignmentProducerSelectors file=Alignment*SelectorModule.cc,AlignmentMuonHIPTrajectorySelector.cc>
@@ -52,3 +53,4 @@
  <use name=TrackingTools/TransientTrackingRecHit>
  <use name=root>
 </library>
+
diff --git a/Alignment/CommonAlignmentProducer/python/AlignmentProducer_cff.py b/Alignment/CommonAlignmentProducer/python/AlignmentProducer_cff.py
@@ -42,6 +42,7 @@
                     beamSpotTag           = cms.InputTag("offlineBeamSpot"),
                     # run input
                     tkLasBeamTag          = cms.InputTag(""), # not used if empty
+                    HitPrescaleMap          = cms.InputTag(""), # not used if empty
 
                     # Choose one algorithm with configuration, HIP is default
                     algoConfig = cms.PSet(HIPAlignmentAlgorithm), # why not by reference?