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

Jump to bottom

migrate SiStripDCSStatus to getByToken #2867

Merged
merged 2 commits into from
Apr 14, 2014
Merged

migrate SiStripDCSStatus to getByToken #2867

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
75b7610
migrate SiStripDCSStatus to getByToken
mtosi Mar 14, 2014
1986a83
getByToken also for FEDRawDataCollection
mtosi Mar 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CalibTracker/SiStripCommon/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="CondFormats/DataRecord"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="Geometry/Records"/>
Expand Down
7 changes: 7 additions & 0 deletions CalibTracker/SiStripCommon/interface/ShallowClustersProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Utilities/interface/InputTag.h"
#include "FWCore/Utilities/interface/EDGetToken.h"
#include "DataFormats/Common/interface/DetSetVector.h"

#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"

class SiStripClusterInfo;
class SiStripProcessedRawDigi;
class TrackerTopology;
Expand Down Expand Up @@ -37,6 +41,9 @@ class ShallowClustersProducer : public edm::EDProducer {
float outsideasymm() const {return (last-first)/(last+first);}
};

edm::EDGetTokenT<edm::DetSetVector<SiStripCluster> > theClustersToken_;
edm::EDGetTokenT<edm::DetSetVector<SiStripProcessedRawDigi> > theDigisToken_;

};

#endif
13 changes: 12 additions & 1 deletion CalibTracker/SiStripCommon/interface/SiStripDCSStatus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,17 @@

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "FWCore/Utilities/interface/EDGetToken.h"

#include "DataFormats/Scalers/interface/DcsStatus.h"
#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"


class SiStripDCSStatus {
public:
SiStripDCSStatus();
SiStripDCSStatus(edm::ConsumesCollector && iC) : SiStripDCSStatus( iC ) {};
SiStripDCSStatus(edm::ConsumesCollector & iC);
~SiStripDCSStatus();

bool getStatus(edm::Event const& e, edm::EventSetup const& eSetup);
Expand All @@ -20,6 +27,10 @@ class SiStripDCSStatus {
bool trackerAbsent;
bool rawdataAbsent;
bool initialised;

edm::EDGetTokenT<DcsStatusCollection> dcsStatusToken_;
edm::EDGetTokenT<FEDRawDataCollection> rawDataToken_;

};

#endif
11 changes: 7 additions & 4 deletions CalibTracker/SiStripCommon/plugins/ShallowClustersProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
#include "boost/foreach.hpp"

ShallowClustersProducer::ShallowClustersProducer(const edm::ParameterSet& iConfig)
: theClustersLabel(iConfig.getParameter<edm::InputTag>("Clusters")),
Prefix(iConfig.getParameter<std::string>("Prefix") )
: Prefix(iConfig.getParameter<std::string>("Prefix") )
{
produces <std::vector<unsigned> > ( Prefix + "number" );
produces <std::vector<unsigned> > ( Prefix + "width" );
Expand Down Expand Up @@ -51,6 +50,8 @@ ShallowClustersProducer::ShallowClustersProducer(const edm::ParameterSet& iConfi
produces <std::vector<int> > ( Prefix + "petal" );
produces <std::vector<int> > ( Prefix + "stereo" );

theClustersToken_ = consumes<edm::DetSetVector<SiStripCluster> > (iConfig.getParameter<edm::InputTag>("Clusters"));
theDigisToken_ = consumes<edm::DetSetVector<SiStripProcessedRawDigi> > (edm::InputTag("siStripProcessedRawDigis", ""));
}

void ShallowClustersProducer::
Expand Down Expand Up @@ -98,10 +99,12 @@ produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
std::auto_ptr<std::vector<int> > stereo ( new std::vector<int>());

edm::Handle<edmNew::DetSetVector<SiStripCluster> > clusters;
iEvent.getByLabel(theClustersLabel, clusters);
// iEvent.getByLabel(theClustersLabel, clusters);
iEvent.getByToken(theClustersToken_, clusters);

edm::Handle<edm::DetSetVector<SiStripProcessedRawDigi> > rawProcessedDigis;
iEvent.getByLabel("siStripProcessedRawDigis", "", rawProcessedDigis);
// iEvent.getByLabel("siStripProcessedRawDigis", "", rawProcessedDigis);
iEvent.getByToken(theDigisToken_,rawProcessedDigis);

edmNew::DetSetVector<SiStripCluster>::const_iterator itClusters=clusters->begin();
for(;itClusters!=clusters->end();++itClusters){
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripCommon/plugins/SiStripDCSFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class SiStripDCSFilter : public edm::EDFilter {
// -- Constructor
//
SiStripDCSFilter::SiStripDCSFilter( const edm::ParameterSet & pset ) {
dcsStatus_ = new SiStripDCSStatus();
dcsStatus_ = new SiStripDCSStatus(consumesCollector());
}
//
// -- Destructor
Expand Down
13 changes: 8 additions & 5 deletions CalibTracker/SiStripCommon/src/SiStripDCSStatus.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
#include "FWCore/Framework/interface/ESHandle.h"

#include "DataFormats/Common/interface/Handle.h"
#include "DataFormats/Scalers/interface/DcsStatus.h"

#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
#include "DataFormats/FEDRawData/interface/FEDRawData.h"
#include "DataFormats/FEDRawData/interface/FEDNumbering.h"

Expand All @@ -24,14 +22,17 @@
//
// -- Constructor
//
SiStripDCSStatus::SiStripDCSStatus() :
SiStripDCSStatus::SiStripDCSStatus(edm::ConsumesCollector & iC) :
TIBTIDinDAQ(false),
TOBinDAQ(false),
TECFinDAQ(false),
TECBinDAQ(false),
trackerAbsent(false),
rawdataAbsent(true),
initialised(false) {

dcsStatusToken_ = iC.consumes<DcsStatusCollection>(edm::InputTag("scalersRawToDigi"));
rawDataToken_ = iC.consumes<FEDRawDataCollection>(edm::InputTag("source"));
}
//
// -- Destructor
Expand All @@ -47,7 +48,8 @@ bool SiStripDCSStatus::getStatus(edm::Event const& e, edm::EventSetup const& eSe
if (!initialised) initialise(e, eSetup);

edm::Handle<DcsStatusCollection> dcsStatus;
e.getByLabel("scalersRawToDigi", dcsStatus);
// e.getByLabel("scalersRawToDigi", dcsStatus);
e.getByToken(dcsStatusToken_, dcsStatus);
if ( trackerAbsent || !dcsStatus.isValid()) return retVal;
if ((*dcsStatus).size() == 0) return retVal;

Expand Down Expand Up @@ -107,7 +109,8 @@ void SiStripDCSStatus::initialise(edm::Event const& e, edm::EventSetup const& eS
auto connectedFEDs = fedCabling_->fedIds();

edm::Handle<FEDRawDataCollection> rawDataHandle;
e.getByLabel("source", rawDataHandle);
// e.getByLabel("source", rawDataHandle);
e.getByToken(rawDataToken_, rawDataHandle);

if ( !rawDataHandle.isValid() ) {
rawdataAbsent = true;
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorCluster/src/SiStripMonitorCluster.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ SiStripMonitorCluster::SiStripMonitorCluster(const edm::ParameterSet& iConfig)
apvPhaseProducerToken_ = consumes<APVCyclePhaseCollection>(conf_.getParameter<edm::InputTag>("ApvPhaseProducer") );
// Create DCS Status
bool checkDCS = conf_.getParameter<bool>("UseDCSFiltering");
if (checkDCS) dcsStatus_ = new SiStripDCSStatus();
if (checkDCS) dcsStatus_ = new SiStripDCSStatus(consumesCollector());
else dcsStatus_ = 0;

}
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ SiStripMonitorDigi::SiStripMonitorDigi(const edm::ParameterSet& iConfig) :

// Create DCS Status
bool checkDCS = conf_.getParameter<bool>("UseDCSFiltering");
if (checkDCS) dcsStatus_ = new SiStripDCSStatus();
if (checkDCS) dcsStatus_ = new SiStripDCSStatus(consumesCollector());
else dcsStatus_ = 0;

//initialize boolean for the data-presence check (needed for TotalNumberOfDigisFailure histogram)
Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ SiStripMonitorTrack::SiStripMonitorTrack(const edm::ParameterSet& conf):

// Create DCS Status
bool checkDCS = conf_.getParameter<bool>("UseDCSFiltering");
if (checkDCS) dcsStatus_ = new SiStripDCSStatus();
if (checkDCS) dcsStatus_ = new SiStripDCSStatus(consumesCollector());
else dcsStatus_ = 0;
}

Expand Down