Skip to content

Commit

Permalink
Merge pull request #6716 from mschrode/encapsulateEventInfoAndRunInfo…
Browse files Browse the repository at this point in the history 
…Members-53X

Important BUG FIX in parameter assignment of millepede-based tracker alignment
  • Loading branch information
@cmsbuild
cmsbuild committed Mar 25, 2015
2 parents 7b1ab8f + 9976f46 commit 1bd3b47
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 34 deletions.
45 changes: 31 additions & 14 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h
View file
Expand Up @@ -25,8 +25,9 @@ class Trajectory;
#include "Alignment/LaserAlignment/interface/TsosVectorCollection.h"
#include "DataFormats/Alignment/interface/TkFittedLasBeamCollectionFwd.h"
#include "DataFormats/Alignment/interface/AliClusterValueMapFwd.h"
#include "FWCore/Framework/interface/Event.h"

namespace edm { class EventID; class RunID; class EventSetup; class ParameterSet; }
namespace edm { class EventSetup; class ParameterSet; }
namespace reco { class Track; class BeamSpot; }

class AlignmentAlgorithmBase
Expand All @@ -40,25 +41,41 @@ class AlignmentAlgorithmBase
typedef std::pair<RunNumber,RunNumber> RunRange;

/// define event information passed to algorithms
struct EventInfo {
EventInfo(const edm::EventID &eventId,
const ConstTrajTrackPairCollection &trajTrackPairs,
const reco::BeamSpot &beamSpot,
const AliClusterValueMap *clusterValueMap)
: eventId_(eventId), trajTrackPairs_(trajTrackPairs), beamSpot_(beamSpot), clusterValueMap_(clusterValueMap) {}

const edm::EventID &eventId_;
class EventInfo {
public:
EventInfo(const edm::EventID &theEventId,
const ConstTrajTrackPairCollection &theTrajTrackPairs,
const reco::BeamSpot &theBeamSpot,
const AliClusterValueMap *theClusterValueMap)
: eventId_(theEventId), trajTrackPairs_(theTrajTrackPairs), beamSpot_(theBeamSpot), clusterValueMap_(theClusterValueMap) {}

const edm::EventID eventId() const { return eventId_; }
const ConstTrajTrackPairCollection& trajTrackPairs() const { return trajTrackPairs_; }
const reco::BeamSpot& beamSpot() const { return beamSpot_; }
const AliClusterValueMap* clusterValueMap() const { return clusterValueMap_; }///might be null!


private:
const edm::EventID eventId_;
const ConstTrajTrackPairCollection &trajTrackPairs_;
const reco::BeamSpot &beamSpot_;
const AliClusterValueMap *clusterValueMap_;///might be null!
};

/// define run information passed to algorithms (in endRun)
struct EndRunInfo {
EndRunInfo(const edm::RunID &runId, const TkFittedLasBeamCollection *tkLasBeams,
const TsosVectorCollection *tkLasBeamTsoses)
: runId_(runId), tkLasBeams_(tkLasBeams), tkLasBeamTsoses_(tkLasBeamTsoses) {}
const edm::RunID &runId_;
class EndRunInfo {
public:
EndRunInfo(const edm::RunID &theRunId, const TkFittedLasBeamCollection *theTkLasBeams,
const TsosVectorCollection *theTkLasBeamTsoses)
: runId_(theRunId), tkLasBeams_(theTkLasBeams), tkLasBeamTsoses_(theTkLasBeamTsoses) {}

const edm::RunID runId() const { return runId_; }
const TkFittedLasBeamCollection* tkLasBeams() const { return tkLasBeams_; } /// might be null!
const TsosVectorCollection* tkLasBeamTsoses() const { return tkLasBeamTsoses_; } /// might be null!


private:
const edm::RunID runId_;
const TkFittedLasBeamCollection *tkLasBeams_; /// might be null!
const TsosVectorCollection *tkLasBeamTsoses_; /// might be null!
};
Expand Down
10 changes: 5 additions & 5 deletions Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc
View file
Expand Up @@ -704,7 +704,7 @@ void HIPAlignmentAlgorithm::run(const edm::EventSetup& setup, const EventInfo &e
theFile->cd();

// loop over tracks
const ConstTrajTrackPairCollection &tracks = eventInfo.trajTrackPairs_;
const ConstTrajTrackPairCollection &tracks = eventInfo.trajTrackPairs();
for (ConstTrajTrackPairCollection::const_iterator it=tracks.begin();
it!=tracks.end();
++it) {
Expand Down Expand Up @@ -778,7 +778,7 @@ void HIPAlignmentAlgorithm::run(const edm::EventSetup& setup, const EventInfo &e

//////////Hit prescaling part
bool skiphit = false;
if (eventInfo.clusterValueMap_) {
if (eventInfo.clusterValueMap()) {
// check from the PrescalingMap if the hit was taken.
// If not skip to the next TM
// bool hitTaken=false;
Expand All @@ -796,7 +796,7 @@ void HIPAlignmentAlgorithm::run(const edm::EventSetup& setup, const EventInfo &e
if (stripHit1D) {
SiStripRecHit1D::ClusterRef stripclust(stripHit1D->cluster());
// myflag=PrescMap[stripclust];
myflag = (*eventInfo.clusterValueMap_)[stripclust];
myflag = (*eventInfo.clusterValueMap())[stripclust];
} else {
edm::LogError("HIPAlignmentAlgorithm")
<< "ERROR in <HIPAlignmentAlgorithm::run>: Dynamic cast of Strip RecHit failed! "
Expand All @@ -810,7 +810,7 @@ void HIPAlignmentAlgorithm::run(const edm::EventSetup& setup, const EventInfo &e
if (stripHit2D) {
SiStripRecHit2D::ClusterRef stripclust(stripHit2D->cluster());
// myflag=PrescMap[stripclust];
myflag = (*eventInfo.clusterValueMap_)[stripclust];
myflag = (*eventInfo.clusterValueMap())[stripclust];
} else {
edm::LogError("HIPAlignmentAlgorithm")
<< "ERROR in <HIPAlignmentAlgorithm::run>: Dynamic cast of Strip RecHit failed! "
Expand All @@ -824,7 +824,7 @@ void HIPAlignmentAlgorithm::run(const edm::EventSetup& setup, const EventInfo &e
if (pixelhit) {
SiPixelClusterRefNew pixelclust(pixelhit->cluster());
// myflag=PrescMap[pixelclust];
myflag = (*eventInfo.clusterValueMap_)[pixelclust];
myflag = (*eventInfo.clusterValueMap())[pixelclust];
}
else {
edm::LogError("HIPAlignmentAlgorithm")
Expand Down
6 changes: 3 additions & 3 deletions Alignment/KalmanAlignmentAlgorithm/plugins/KalmanAlignmentAlgorithm.cc
View file
Expand Up @@ -160,8 +160,8 @@ void KalmanAlignmentAlgorithm::run( const edm::EventSetup & setup, const EventIn
try
{
// Run the refitter algorithm
const ConstTrajTrackPairCollection &tracks = eventInfo.trajTrackPairs_;
const reco::BeamSpot &beamSpot = eventInfo.beamSpot_;
const ConstTrajTrackPairCollection &tracks = eventInfo.trajTrackPairs();
const reco::BeamSpot &beamSpot = eventInfo.beamSpot();
TrackletCollection refittedTracklets = theRefitter->refitTracks( setup, theAlignmentSetups, tracks, &beamSpot );

// Associate tracklets to alignment setups
Expand All @@ -186,7 +186,7 @@ void KalmanAlignmentAlgorithm::run( const edm::EventSetup & setup, const EventIn

// Construct reference trajectories
ReferenceTrajectoryCollection trajectories =
itMap->first->trajectoryFactory()->trajectories( setup, tracklets, external, eventInfo.beamSpot_ );
itMap->first->trajectoryFactory()->trajectories( setup, tracklets, external, eventInfo.beamSpot() );

ReferenceTrajectoryCollection::iterator itTrajectories;

Expand Down
8 changes: 4 additions & 4 deletions Alignment/MillePedeAlignmentAlgorithm/src/MillePedeAlignmentAlgorithm.cc
View file
Expand Up @@ -284,7 +284,7 @@ void MillePedeAlignmentAlgorithm::terminate()
void MillePedeAlignmentAlgorithm::run(const edm::EventSetup &setup, const EventInfo &eventInfo)
{
if (!this->isMode(myMilleBit)) return; // no theMille created...
const ConstTrajTrackPairCollection &tracks = eventInfo.trajTrackPairs_;
const ConstTrajTrackPairCollection &tracks = eventInfo.trajTrackPairs();

if (theMonitor) { // monitor input tracks
for (ConstTrajTrackPairCollection::const_iterator iTrajTrack = tracks.begin();
Expand All @@ -293,7 +293,7 @@ void MillePedeAlignmentAlgorithm::run(const edm::EventSetup &setup, const EventI
}
}

const RefTrajColl trajectories(theTrajectoryFactory->trajectories(setup, tracks, eventInfo.beamSpot_));
const RefTrajColl trajectories(theTrajectoryFactory->trajectories(setup, tracks, eventInfo.beamSpot()));

// Now loop over ReferenceTrajectoryCollection
unsigned int refTrajCount = 0; // counter for track monitoring if 1 track per trajectory
Expand Down Expand Up @@ -397,9 +397,9 @@ MillePedeAlignmentAlgorithm::addHitCount(const std::vector<AlignmentParameters*>
void MillePedeAlignmentAlgorithm::endRun(const EventInfo &eventInfo, const EndRunInfo &runInfo,
const edm::EventSetup &setup)
{
if(runInfo.tkLasBeams_ && runInfo.tkLasBeamTsoses_){
if(runInfo.tkLasBeams() && runInfo.tkLasBeamTsoses()){
// LAS beam treatment
this->addLaserData(eventInfo, *(runInfo.tkLasBeams_), *(runInfo.tkLasBeamTsoses_));
this->addLaserData(eventInfo, *(runInfo.tkLasBeams()), *(runInfo.tkLasBeamTsoses()));
}
}

Expand Down
6 changes: 3 additions & 3 deletions Alignment/MillePedeAlignmentAlgorithm/src/RunRangeDependentPedeLabeler.cc
View file
Expand Up @@ -159,8 +159,8 @@ unsigned int RunRangeDependentPedeLabeler::parameterLabel(Alignable *alignable,
for (RunRangeVector::const_iterator iRunRange = runRanges.begin();
iRunRange != runRanges.end();
++iRunRange) {
if (eventInfo.eventId_.run() >= iRunRange->first &&
eventInfo.eventId_.run() <= iRunRange->second) {
if (eventInfo.eventId().run() >= iRunRange->first &&
eventInfo.eventId().run() <= iRunRange->second) {
return position->second + offset * theParamInstanceOffset + parNum;
}
offset++;
Expand All @@ -170,7 +170,7 @@ unsigned int RunRangeDependentPedeLabeler::parameterLabel(Alignable *alignable,
<< "@SUB=RunRangeDependentPedeLabeler::parameterLabel" << "Instance for Alignable "
<< typeid(*alignable).name() << " not in map, det/subdet/alignableStructureType = "
<< detId.det() << "/" << detId.subdetId() << "/" << alignable->alignableObjectId()
<< " for run " << eventInfo.eventId_.run();
<< " for run " << eventInfo.eventId().run();
return 0;
} else {
return position->second + parNum;
Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsAlignmentAlgorithm.cc
View file
Expand Up @@ -243,7 +243,7 @@ void CSCOverlapsAlignmentAlgorithm::run(const edm::EventSetup& iSetup, const Eve

if (m_trackTransformer != NULL) m_trackTransformer->setServices(iSetup);

const ConstTrajTrackPairCollection &trajtracks = eventInfo.trajTrackPairs_;
const ConstTrajTrackPairCollection &trajtracks = eventInfo.trajTrackPairs();
for (ConstTrajTrackPairCollection::const_iterator trajtrack = trajtracks.begin(); trajtrack != trajtracks.end(); ++trajtrack) {
const Trajectory* traj = (*trajtrack).first;
const reco::Track* track = (*trajtrack).second;
Expand Down
4 changes: 2 additions & 2 deletions Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentFromReference.cc
View file
Expand Up @@ -627,7 +627,7 @@ void MuonAlignmentFromReference::run(const edm::EventSetup& iSetup, const EventI

if (m_muonCollectionTag.label().empty()) // use trajectories
{
const ConstTrajTrackPairCollection &trajtracks = eventInfo.trajTrackPairs_;
const ConstTrajTrackPairCollection &trajtracks = eventInfo.trajTrackPairs();
for (ConstTrajTrackPairCollection::const_iterator trajtrack = trajtracks.begin(); trajtrack != trajtracks.end(); ++trajtrack)
{
m_counter_tracks++;
Expand All @@ -639,7 +639,7 @@ void MuonAlignmentFromReference::run(const edm::EventSetup& iSetup, const EventI
{
m_counter_trackmomentum++;

if ( fabs(track->dxy(eventInfo.beamSpot_.position())) < m_maxDxy )
if ( fabs(track->dxy(eventInfo.beamSpot().position())) < m_maxDxy )
{
m_counter_trackdxy++;

Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignmentAlgorithms/plugins/MuonDTLocalMillepedeAlgorithm.cc
View file
Expand Up @@ -136,7 +136,7 @@ void MuonDTLocalMillepedeAlgorithm::run(const edm::EventSetup& setup, const Even
//Only important in the production mode
if(workingmode != 0) return;

const ConstTrajTrackPairCollection &tracks = eventInfo.trajTrackPairs_;
const ConstTrajTrackPairCollection &tracks = eventInfo.trajTrackPairs();
for( ConstTrajTrackPairCollection::const_iterator it=tracks.begin();
it!=tracks.end();it++) {

Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignmentAlgorithms/plugins/MuonMillepedeAlgorithm.cc
View file
Expand Up @@ -240,7 +240,7 @@

// loop over tracks
//int t_counter = 0;
const ConstTrajTrackPairCollection &tracks = eventInfo.trajTrackPairs_;
const ConstTrajTrackPairCollection &tracks = eventInfo.trajTrackPairs();
for( ConstTrajTrackPairCollection::const_iterator it=tracks.begin();
it!=tracks.end();it++) {

Expand Down

0 comments on commit 1bd3b47

Please sign in to comment.