Skip to content

Commit

Permalink
Merge pull request #1890 from diguida/fix-consumes-Validation_Tracker…
Browse files Browse the repository at this point in the history 
…RecHits

DQM fixes -- Fix consumes validation tracker rec hits
  • Loading branch information
@ktf
ktf committed Dec 19, 2013
2 parents b4817ec + 682e5fd commit 1b39b80
Show file tree
Hide file tree
Showing 4 changed files with 144 additions and 152 deletions.
55 changes: 16 additions & 39 deletions Validation/TrackerRecHits/interface/SiPixelRecHitsValid.h
View file
Expand Up @@ -7,44 +7,20 @@
* Created: 6/7/06
*/

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"

#include "DataFormats/Common/interface/Handle.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

//DWM histogram services
#include "DQMServices/Core/interface/DQMStore.h"

#include "FWCore/ServiceRegistry/interface/Service.h"

//Simhit stuff
#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"

#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
#include "DataFormats/DetId/interface/DetId.h"

#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"

#include "FWCore/Utilities/interface/InputTag.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"

#include <string>
#include "DQMServices/Core/interface/MonitorElement.h"

class DQMStore;
class DetId;
class MonitorElement;
class PSimHit;
class PixelGeomDetUnit;
class SiPixelRecHit;
class TrackerTopology;

class SiPixelRecHitsValid : public edm::EDAnalyzer {
Expand All @@ -60,19 +36,17 @@ class SiPixelRecHitsValid : public edm::EDAnalyzer {

virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
void beginJob();
void beginRun( const edm::Run& r, const edm::EventSetup& c );
void endJob();

private:
DQMStore* dbe_;
std::string outputFile_;

edm::ParameterSet conf_;

void fillBarrel(const SiPixelRecHit &,const PSimHit &, DetId, const PixelGeomDetUnit *,
const TrackerTopology *tTopo);
void fillForward(const SiPixelRecHit &, const PSimHit &, DetId, const PixelGeomDetUnit *,
const TrackerTopology *tTopo);

std::string outputFile_;

//Clusters BPIX
MonitorElement* clustYSizeModule[8];
MonitorElement* clustXSizeLayer[3];
Expand Down Expand Up @@ -134,7 +108,10 @@ class SiPixelRecHitsValid : public edm::EDAnalyzer {
MonitorElement* recHitYPullDisk1Plaquettes[7];
MonitorElement* recHitYPullDisk2Plaquettes[7];

edm::InputTag src_;
DQMStore* dbe_;

edm::ParameterSet conf_;
edm::EDGetTokenT<SiPixelRecHitCollection> siPixelRecHitCollectionToken_;
};

#endif
59 changes: 21 additions & 38 deletions Validation/TrackerRecHits/interface/SiStripRecHitsValid.h
View file
Expand Up @@ -13,39 +13,21 @@

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
//only mine
#include "DataFormats/Common/interface/Handle.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

//DQM services for histogram
#include "DQMServices/Core/interface/DQMStore.h"

#include "FWCore/ServiceRegistry/interface/Service.h"

//--- for SimHit association
#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"

#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/CommonTopologies/interface/StripTopology.h"
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/GluedGeomDet.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h"
#include "FWCore/Utilities/interface/InputTag.h"
#include "DataFormats/GeometrySurface/interface/Plane.h"
#include "DataFormats/GeometryVector/interface/LocalPoint.h"
#include "DataFormats/GeometryVector/interface/LocalVector.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h"
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h"

#include <string>
#include "DQMServices/Core/interface/MonitorElement.h"
#include <utility>

class DQMStore;
class MonitorElement;
class PSimHit;
class StripGeomDetUnit;

class SiStripRecHitsValid : public edm::EDAnalyzer {

Expand All @@ -59,12 +41,16 @@ class SiStripRecHitsValid : public edm::EDAnalyzer {

virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
void beginJob();
void beginRun( const edm::Run& r, const edm::EventSetup& c );
void endJob();

private:
//Back-End Interface
DQMStore* dbe_;
std::pair<LocalPoint,LocalVector> projectHit( const PSimHit& hit, const StripGeomDetUnit* stripDet,
const BoundPlane& plane );
std::vector<PSimHit> matched;
std::string outputFile_;
DQMStore* dbe_;
MonitorElement* meNumTotRphi;
MonitorElement* meNumTotSas;
MonitorElement* meNumTotMatched;
Expand Down Expand Up @@ -179,13 +165,7 @@ class SiStripRecHitsValid : public edm::EDAnalyzer {
MonitorElement* meResyMatchedTEC[5];
MonitorElement* meChi2MatchedTEC[5];

std::vector<PSimHit> matched;
std::pair<LocalPoint,LocalVector> projectHit( const PSimHit& hit, const StripGeomDetUnit* stripDet,
const BoundPlane& plane);
edm::ParameterSet conf_;
//const StripTopology* topol;

static const int MAXHIT = 1000;
static constexpr int MAXHIT = 1000;
float rechitrphix[MAXHIT];
float rechitrphierrx[MAXHIT];
float rechitrphiy[MAXHIT];
Expand Down Expand Up @@ -218,8 +198,11 @@ class SiStripRecHitsValid : public edm::EDAnalyzer {
float rechitmatchedresy[MAXHIT];
float rechitmatchedchi2[MAXHIT];

edm::ParameterSet conf_;
//const StripTopology* topol;

edm::InputTag matchedRecHits_, rphiRecHits_, stereoRecHits_;
edm::EDGetTokenT<SiStripMatchedRecHit2DCollection> siStripMatchedRecHit2DCollectionToken_;
edm::EDGetTokenT<SiStripRecHit2DCollection> siStripRecHit2DCollection_rphi_Token_, siStripRecHit2DCollection_stereo_Token_;
};

#endif
82 changes: 49 additions & 33 deletions Validation/TrackerRecHits/plugins/SiPixelRecHitsValid.cc
View file
Expand Up @@ -9,38 +9,62 @@

#include "Validation/TrackerRecHits/interface/SiPixelRecHitsValid.h"

#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"

#include "DataFormats/GeometryVector/interface/LocalPoint.h"
#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h"

#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
#include "DataFormats/Common/interface/DetSetVector.h"
#include "DataFormats/Common/interface/Handle.h"
#include "DataFormats/Common/interface/OwnVector.h"
#include "DataFormats/Common/interface/Ref.h"
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
#include "DataFormats/GeometryVector/interface/LocalPoint.h"
#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"

#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/MonitorElement.h"

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ServiceRegistry/interface/Service.h"

#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
#include "Geometry/CommonDetUnit/interface/GeomDetUnit.h"
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
#include "DataFormats/Common/interface/Ref.h"
#include "DataFormats/Common/interface/DetSetVector.h"
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"

#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"

#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"

#include <math.h>
#include "DQMServices/Core/interface/DQMStore.h"

using namespace std;
using namespace edm;
SiPixelRecHitsValid::SiPixelRecHitsValid(const edm::ParameterSet& ps)
: outputFile_( ps.getUntrackedParameter<std::string>( "outputFile", "pixelrechitshisto.root" ) )
, dbe_(0)
, conf_(ps)
, siPixelRecHitCollectionToken_( consumes<SiPixelRecHitCollection>( ps.getParameter<edm::InputTag>( "src" ) ) ) {

}

SiPixelRecHitsValid::SiPixelRecHitsValid(const ParameterSet& ps):
dbe_(0),
conf_(ps),
src_( ps.getParameter<edm::InputTag>( "src" ) )
{
outputFile_ = ps.getUntrackedParameter<string>("outputFile", "pixelrechitshisto.root");
dbe_ = Service<DQMStore>().operator->();
SiPixelRecHitsValid::~SiPixelRecHitsValid() {
}

void SiPixelRecHitsValid::beginJob() {

}

void SiPixelRecHitsValid::beginRun( const edm::Run& r, const edm::EventSetup& c ) {
dbe_ = edm::Service<DQMStore>().operator->();
//dbe_->showDirStructure();
dbe_->setCurrentFolder("TrackerRecHitsV/TrackerRecHits/Pixel/clustBPIX");

Expand Down Expand Up @@ -238,14 +262,6 @@ SiPixelRecHitsValid::SiPixelRecHitsValid(const ParameterSet& ps):
sprintf(histo, "RecHit_YPull_Disk2_Plaquette%d", i+1);
recHitYPullDisk2Plaquettes[i] = dbe_->book1D(histo, "RecHit YPull Disk2 by plaquette", 100, -10.0, 10.0);
}

}

SiPixelRecHitsValid::~SiPixelRecHitsValid() {
}

void SiPixelRecHitsValid::beginJob() {

}

void SiPixelRecHitsValid::endJob() {
Expand All @@ -260,13 +276,13 @@ void SiPixelRecHitsValid::analyze(const edm::Event& e, const edm::EventSetup& es
es.get<IdealGeometryRecord>().get(tTopoHand);
const TrackerTopology *tTopo=tTopoHand.product();

LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " << e.id().event();
edm::LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " << e.id().event();
if ( (int) e.id().event() % 1000 == 0 )
cout << " Run = " << e.id().run() << " Event = " << e.id().event() << endl;
std::cout << " Run = " << e.id().run() << " Event = " << e.id().event() << std::endl;

//Get RecHits
edm::Handle<SiPixelRecHitCollection> recHitColl;
e.getByLabel( src_, recHitColl);
e.getByToken( siPixelRecHitCollectionToken_, recHitColl );

//Get event setup
edm::ESHandle<TrackerGeometry> geom;
Expand Down

0 comments on commit 1b39b80

Please sign in to comment.