Skip to content

Commit

Permalink
Merged from-CMSSW_7_0_0_pre9_tracking_as_independent from repository …
Browse files Browse the repository at this point in the history 
…mtosi
  • Loading branch information
@mtosi
mtosi committed Dec 12, 2013
2 parents 323efe4 + 3bafed8 commit fcee303
Show file tree
Hide file tree
Showing 57 changed files with 5,543 additions and 3,109 deletions.
6 changes: 5 additions & 1 deletion DQM/SiStripMonitorClient/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Framework"/>
<use name="EventFilter/Utilities"/>
<use name="DQMServices/ClientConfig"/>
<use name="CalibFormats/SiStripObjects"/>
<use name="CondFormats/SiStripObjects"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/RunInfo"/>
<use name="CommonTools/TrackerMap"/>
<use name="CalibTracker/Records"/>
<use name="DQM/TrackerCommon"/>
<use name="DQM/SiStripCommon"/>
<use name="DQM/SiStripMonitorSummary"/>
<use name="DataFormats/SiStripDetId"/>
<use name="boost"/>
<use name="root"/>
<flags EDM_PLUGIN="1"/>
<export>
<lib name="1"/>
</export>
70 changes: 5 additions & 65 deletions DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_tier0.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<TESTSCONFIGURATION>
<QTEST name="MeanWithinExpectedRange:nFEDErrors" activate="true">
<TYPE>MeanWithinExpected</TYPE>
<PARAM name="minEntries">0</PARAM>
<PARAM name="error">0.05</PARAM>
<PARAM name="warning">0.3</PARAM>
<PARAM name="mean">1.0</PARAM>
Expand All @@ -12,6 +13,7 @@
</QTEST>
<QTEST name="MeanWithinExpectedRange:nBadChannelStatusBits" activate="true">
<TYPE>MeanWithinExpected</TYPE>
<PARAM name="minEntries">0</PARAM>
<PARAM name="error">0.05</PARAM>
<PARAM name="warning">0.3</PARAM>
<PARAM name="mean">1.0</PARAM>
Expand All @@ -23,6 +25,7 @@
</QTEST>
<QTEST name="MeanWithinExpectedRange:nBadActiveChannelStatusBits" activate="true">
<TYPE>MeanWithinExpected</TYPE>
<PARAM name="minEntries">0</PARAM>
<PARAM name="error">0.05</PARAM>
<PARAM name="warning">0.3</PARAM>
<PARAM name="mean">1.0</PARAM>
Expand All @@ -46,6 +49,7 @@
</QTEST>
<QTEST name="CompareToMedian:TkHistoNumberOfCluster" activate="true">
<TYPE>CompareToMedian</TYPE>
<PARAM name="minEntries">0</PARAM>
<PARAM name="MinRel">0.1</PARAM>
<PARAM name="MaxRel">5.</PARAM>
<PARAM name="UseEmptyBins">0</PARAM>
Expand All @@ -57,6 +61,7 @@
</QTEST>
<QTEST name="CompareToMedian:TkHistoNumberOfDigi" activate="true">
<TYPE>CompareToMedian</TYPE>
<PARAM name="minEntries">0</PARAM>
<PARAM name="MinRel">0.1</PARAM>
<PARAM name="MaxRel">5.</PARAM>
<PARAM name="UseEmptyBins">0</PARAM>
Expand Down Expand Up @@ -121,53 +126,6 @@
<PARAM name="xmin">0</PARAM>
<PARAM name="xmax">10.0</PARAM>
</QTEST>
<QTEST name="XrangeWithin:NumberOfTracks" activate="true">
<TYPE>ContentsXRange</TYPE>
<PARAM name="error">0.85</PARAM>
<PARAM name="warning">0.95</PARAM>
<PARAM name="xmin">0.0</PARAM>
<PARAM name="xmax">800.0</PARAM>
</QTEST>
<QTEST name="XrangeWithin:GoodTrackNumberOfRecHitsPerTrack" activate="true">
<TYPE>ContentsXRange</TYPE>
<PARAM name="error">0.80</PARAM>
<PARAM name="warning">0.90</PARAM>
<PARAM name="xmin">5.0</PARAM>
<PARAM name="xmax">35.0</PARAM>
</QTEST>
<QTEST name="XrangeWithin:GoodTrackChi2oNDF" activate="true">
<TYPE>ContentsXRange</TYPE>
<PARAM name="error">0.85</PARAM>
<PARAM name="warning">0.95</PARAM>
<PARAM name="xmin">0</PARAM>
<PARAM name="xmax">10.0</PARAM>
</QTEST>
<QTEST name="XrangeWithin:GoodTrackPt" activate="true">
<TYPE>ContentsXRange</TYPE>
<PARAM name="error">0.85</PARAM>
<PARAM name="warning">0.95</PARAM>
<PARAM name="xmin">0</PARAM>
<PARAM name="xmax">200.0</PARAM>
</QTEST>
<QTEST name="XrangeWithin:FractionOfGoodTracks" activate="true">
<TYPE>ContentsXRange</TYPE>
<PARAM name="error">0.85</PARAM>
<PARAM name="warning">0.95</PARAM>
<PARAM name="xmin">0.7</PARAM>
<PARAM name="xmax">1.1</PARAM>
</QTEST>
<QTEST name="MeanWithinExpected:TrackSeed" activate="true">
<TYPE>MeanWithinExpected</TYPE>
<PARAM name="error">0.75</PARAM>
<PARAM name="warning">0.90</PARAM>
<PARAM name="mean">1.0</PARAM>
<PARAM name="useRMS">0</PARAM>
<PARAM name="useSigma">0</PARAM>
<PARAM name="useRange">1</PARAM>
<PARAM name="minEntries">0</PARAM>
<PARAM name="xmin">0.5</PARAM>
<PARAM name="xmax">50000.0</PARAM>
</QTEST>
<LINK name="*nFEDErrors">
<TestName activate="true">MeanWithinExpectedRange:nFEDErrors</TestName>
</LINK>
Expand Down Expand Up @@ -204,22 +162,4 @@
<LINK name="*Summary_ClusterStoNCorr__OnTrack__TID__PLUS__wheel__*">
<TestName activate="true">MeanWithinExpectedRange:StoNTID</TestName>
</LINK>
<LINK name="*TrackParameters/GeneralProperties/GoodTracks/NumberOfGoodTracks_GenTk">
<TestName activate="true">XrangeWithin:NumberOfTracks</TestName>
</LINK>
<LINK name="*TrackParameters/HitProperties/GoodTracks/GoodTrackNumberOfRecHitsPerTrack_GenTk">
<TestName activate="true">XrangeWithin:GoodTrackNumberOfRecHitsPerTrack</TestName>
</LINK>
<LINK name="*TrackParameters/GeneralProperties/GoodTracks/GoodTrackChi2oNDF_GenTk">
<TestName activate="true">XrangeWithin:GoodTrackChi2oNDF</TestName>
</LINK>
<LINK name="*TrackParameters/GeneralProperties/GoodTracks/GoodTrackPt_ImpactPoint_GenTk">
<TestName activate="true">XrangeWithin:GoodTrackPt</TestName>
</LINK>
<LINK name="*TrackParameters/GeneralProperties/GoodTracks/FractionOfGoodTracks_GenTk">
<TestName activate="true">XrangeWithin:FractionOfGoodTracks</TestName>
</LINK>
<LINK name="*TrackParameters/TrackBuilding/NumberOfSeeds_*">
<TestName activate="true">MeanWithinExpected:TrackSeed</TestName>
</LINK>
</TESTSCONFIGURATION>
9 changes: 0 additions & 9 deletions DQM/SiStripMonitorClient/interface/SiStripCertificationInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,7 @@ class SiStripCertificationInfo: public edm::EDAnalyzer {
void resetSiStripCertificationMEs();
void fillSiStripCertificationMEs(edm::EventSetup const& eSetup);

void bookTrackingCertificationMEs();
void resetTrackingCertificationMEs();
void fillTrackingCertificationMEs(edm::EventSetup const& eSetup);

void fillDummySiStripCertification();
void fillDummyTrackingCertification();

void fillSiStripCertificationMEsAtLumi();

Expand All @@ -95,12 +90,8 @@ class SiStripCertificationInfo: public edm::EDAnalyzer {
MonitorElement * SiStripCertification;
MonitorElement * SiStripCertificationMap;
std::map<std::string, SubDetMEs> SubDetMEsMap;
std::map<std::string, MonitorElement*> TrackingMEsMap;
MonitorElement * SiStripCertificationSummaryMap;

MonitorElement * TrackingCertification;

bool trackingCertificationBooked_;
bool sistripCertificationBooked_;
unsigned long long m_cacheID_;

Expand Down
11 changes: 0 additions & 11 deletions DQM/SiStripMonitorClient/interface/SiStripQualityChecker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,17 @@ class SiStripQualityChecker {
std::string detectorTag;
};

struct TrackingMEs{
std::string HistoName;
MonitorElement* TrackingFlag;
float LowerCut;
float UpperCut;
};

void fillDetectorStatus(DQMStore* dqm_store, const edm::ESHandle< SiStripDetCabling >& cabling);
void fillTrackingStatus(DQMStore* dqm_store);
void fillSubDetStatus(DQMStore* dqm_store,const edm::ESHandle< SiStripDetCabling >& cabling, SubDetMEs& mes, unsigned int xbin,float& gflag);
void getModuleStatus(DQMStore* dqm_store, std::vector<MonitorElement*>& layer_mes, int& errdet);

void fillStatusHistogram(MonitorElement*, int xbin, int ybin, float val);
void initialiseBadModuleList();

void fillDetectorStatusAtLumi(DQMStore* dqm_store);
void fillTrackingStatusAtLumi(DQMStore* dqm_store);

std::map<std::string, SubDetMEs> SubDetMEsMap;
std::map<std::string, std::string> SubDetFolderMap;
std::map<std::string, TrackingMEs> TrackingMEsMap;

MonitorElement* DetFractionReportMap;
MonitorElement* SToNReportMap;
Expand All @@ -81,7 +71,6 @@ class SiStripQualityChecker {
edm::ParameterSet pSet_;

bool bookedStripStatus_;
bool bookedTrackingStatus_;
int globalStatusFilling_;
bool useGoodTracks_;

Expand Down
2 changes: 1 addition & 1 deletion DQM/SiStripMonitorClient/interface/SiStripUtility.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class SiStripUtility
static void getSubDetectorTag(uint32_t det_id, std::string& subdet_tag, const TrackerTopology* tTopo);
static void setBadModuleFlag(std::string & hname, uint16_t& flg);
static void getBadModuleStatus(uint16_t flag, std::string& message);
static void getTopFolderPath(DQMStore* dqm_store, std::string type, std::string& path);
static void getTopFolderPath(DQMStore* dqm_store, std::string top_dir, std::string& path);
};

#endif
Loading

0 comments on commit fcee303

Please sign in to comment.