Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

two liner to make AlignmentTrackSelectorModule multi-threaded friendly #9906

Merged
merged 2 commits into from
Jun 26, 2015
Merged

two liner to make AlignmentTrackSelectorModule multi-threaded friendly #9906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d075b
two liner to make AlignmentTrackSelectorModule multi-threaded friendly
mmusich Jun 25, 2015
bad612f
additional fixes
mmusich Jun 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Alignment/CommonAlignmentProducer/plugins/AlignmentCSCBeamHaloSelectorModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h"

// the following include is necessary to clone all track branches
Expand Down Expand Up @@ -42,6 +42,6 @@ struct CSCBeamHaloConfigSelector {
AlignmentCSCBeamHaloSelector theSelector;
};

typedef ObjectSelector<CSCBeamHaloConfigSelector> AlignmentCSCBeamHaloSelectorModule;
typedef ObjectSelectorStream<CSCBeamHaloConfigSelector> AlignmentCSCBeamHaloSelectorModule;

DEFINE_FWK_MODULE( AlignmentCSCBeamHaloSelectorModule );
4 changes: 2 additions & 2 deletions Alignment/CommonAlignmentProducer/plugins/AlignmentCSCOverlapSelectorModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h"

// the following include is necessary to clone all track branches
Expand Down Expand Up @@ -40,6 +40,6 @@ struct CSCOverlapConfigSelector {
AlignmentCSCOverlapSelector theSelector;
};

typedef ObjectSelector<CSCOverlapConfigSelector> AlignmentCSCOverlapSelectorModule;
typedef ObjectSelectorStream<CSCOverlapConfigSelector> AlignmentCSCOverlapSelectorModule;

DEFINE_FWK_MODULE( AlignmentCSCOverlapSelectorModule );
4 changes: 2 additions & 2 deletions Alignment/CommonAlignmentProducer/plugins/AlignmentCSCTrackSelectorModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"

//the selectores used to select the tracks
#include "Alignment/CommonAlignmentProducer/interface/AlignmentCSCTrackSelector.h"
Expand Down Expand Up @@ -41,6 +41,6 @@ struct CSCTrackConfigSelector {
AlignmentCSCTrackSelector theBaseSelector;
};

typedef ObjectSelector<CSCTrackConfigSelector> AlignmentCSCTrackSelectorModule;
typedef ObjectSelectorStream<CSCTrackConfigSelector> AlignmentCSCTrackSelectorModule;

DEFINE_FWK_MODULE( AlignmentCSCTrackSelectorModule );
4 changes: 2 additions & 2 deletions Alignment/CommonAlignmentProducer/plugins/AlignmentTrackSelectorModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"

//the selectores used to select the tracks
#include "Alignment/CommonAlignmentProducer/interface/AlignmentTrackSelector.h"
Expand Down Expand Up @@ -65,6 +65,6 @@ struct TrackConfigSelector {

};

typedef ObjectSelector<TrackConfigSelector> AlignmentTrackSelectorModule;
typedef ObjectSelectorStream<TrackConfigSelector> AlignmentTrackSelectorModule;

DEFINE_FWK_MODULE( AlignmentTrackSelectorModule );
4 changes: 2 additions & 2 deletions Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"

//the selectores used to select the tracks
#include "Calibration/TkAlCaRecoProducers/interface/CalibrationTrackSelector.h"
Expand Down Expand Up @@ -54,6 +54,6 @@ struct SiStripCalTrackConfigSelector {

};

typedef ObjectSelector<SiStripCalTrackConfigSelector> CalibrationTrackSelectorModule;
typedef ObjectSelectorStream<SiStripCalTrackConfigSelector> CalibrationTrackSelectorModule;

DEFINE_FWK_MODULE( CalibrationTrackSelectorModule );