Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 211482
b: "refs/heads/revert-7710-hcal_infinte_loop"
c: b7c6703
h: "refs/heads/CMSSW_8_1_X"
  • Loading branch information
@cmsbuild
cmsbuild committed Jul 29, 2014
1 parent bf7edb0 commit 2778861
Show file tree
Hide file tree
Showing 11 changed files with 69 additions and 84 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Expand Up @@ -85,4 +85,4 @@ refs/heads/revert-13320-fastsim-tracking-refactor: ae94ef559884611d9e8ad87fef432
"refs/heads/revert-7108-TriggerResultFilter_update_74x": d2f4e7b7d82930631c635e1c318c0eaed0721e33
refs/heads/revert-7113-fixFillDescriptionInESRawToDigi: 8015d61c18e91ae37841e710b9262ab93b246774
"refs/heads/revert-7613-revert_to_conddb1": eff5796e6111d19271d96476dbc31f117e1e447b
"refs/heads/revert-7710-hcal_infinte_loop": 6fa40d35005988570214371144b4a50b6d3ded0d
"refs/heads/revert-7710-hcal_infinte_loop": b7c6703862f88d8112595a20befe6ecb2781e132
1 change: 0 additions & 1 deletion ...es/revert-7710-hcal_infinte_loop/DQM/SiStripMonitorClient/src/SiStripCertificationInfo.cc
View file
Expand Up @@ -173,7 +173,6 @@ void SiStripCertificationInfo::analyze(edm::Event const& event, edm::EventSetup
// -- End Luminosity Block
//
void SiStripCertificationInfo::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& iSetup) {
std::cout << "[SiStripCertificationInfo::endLuminosityBlock] " << std::endl;
edm::LogInfo( "SiStripDaqInfo") << "SiStripDaqInfo::endLuminosityBlock";

if (nFEDConnected_ > 0) {
Expand Down
17 changes: 0 additions & 17 deletions ...hes/revert-7710-hcal_infinte_loop/DQM/TrackingMonitorClient/plugins/TrackingOfflineDQM.cc
View file
Expand Up @@ -102,7 +102,6 @@ void TrackingOfflineDQM::beginJob() {
* Event Setup object with Geometry, Magnetic Field, etc.
*/
void TrackingOfflineDQM::beginRun(edm::Run const& run, edm::EventSetup const& eSetup) {
// std::cout << "[TrackingOfflineDQM::beginRun] .. starting" << std::endl;
edm::LogInfo ("BeginRun") <<"TrackingOfflineDQM:: Begining of Run";

int nFEDs = 0;
Expand Down Expand Up @@ -133,15 +132,10 @@ void TrackingOfflineDQM::beginRun(edm::Run const& run, edm::EventSetup const& eS
const int siPixelFedN = (FEDNumbering::MAXSiPixelFEDID-FEDNumbering::MINSiPixelFEDID+1);
allpixelFEDsFound_ = (nPixelFEDs == siPixelFedN);
trackerFEDsFound_ = (nFEDs > 0);
std::cout << "[TrackingOfflineDQM::beginRun] nPixelFEDs: " << nPixelFEDs << " ==> " << allpixelFEDsFound_ << std::endl;
std::cout << "[TrackingOfflineDQM::beginRun] nFEDs: " << nFEDs << " ==> " << trackerFEDsFound_ << std::endl;

if (globalStatusFilling_ > 0) {
actionExecutor_->createGlobalStatus(dqmStore_);
// std::cout << "[TrackingOfflineDQM::beginRun] done actionExecutor_->createStatus" << std::endl;
}

// std::cout << "[TrackingOfflineDQM::beginRun] DONE" << std::endl;
}
/**
* @brief
Expand All @@ -164,7 +158,6 @@ void TrackingOfflineDQM::analyze(edm::Event const& e, edm::EventSetup const& eSe
*/
void TrackingOfflineDQM::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& iSetup) {

// std::cout << "[TrackingOfflineDQM::endLuminosityBlock] .. starting" << std::endl;

edm::LogInfo("TrackingOfflineDQM") << "TrackingOfflineDQM::endLuminosityBlock";

Expand All @@ -183,8 +176,6 @@ void TrackingOfflineDQM::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg,
*/
void TrackingOfflineDQM::endRun(edm::Run const& run, edm::EventSetup const& eSetup){

// std::cout << "[TrackingOfflineDQM::endRun] .. starting" << std::endl;

edm::LogInfo("TrackingOfflineDQM") << "TrackingOfflineDQM::endRun";

if (globalStatusFilling_ > 0) {
Expand All @@ -197,9 +188,6 @@ void TrackingOfflineDQM::endRun(edm::Run const& run, edm::EventSetup const& eSet
actionExecutor_->fillGlobalStatus(dqmStore_);
}
}

// std::cout << "[TrackingOfflineDQM::endRun] DONE" << std::endl;

}
/**
* @brief
Expand All @@ -209,18 +197,13 @@ void TrackingOfflineDQM::endRun(edm::Run const& run, edm::EventSetup const& eSet
*/
void TrackingOfflineDQM::endJob() {

// std::cout << "[TrackingOfflineDQM::endJob] .. starting" << std::endl;

edm::LogInfo("TrackingOfflineDQM") << "TrackingOfflineDQM::endJob";

if (!usedWithEDMtoMEConverter_) {
// Save Output file
dqmStore_->cd();
dqmStore_->save(outputFileName_, "","","");
}

// std::cout << "[TrackingOfflineDQM::endJob] DONE" << std::endl;

}
/**
* @brief
Expand Down
2 changes: 1 addition & 1 deletion branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronAnalyzer_cfi.py
View file
Expand Up @@ -7,7 +7,7 @@
dqmElectronAnalysis = cms.EDAnalyzer("ElectronAnalyzer",

Verbosity = cms.untracked.int32(0),
FinalStep = cms.string("AtRunEnd"),
FinalStep = cms.string("AtJobEnd"),
InputFile = cms.string(""),
OutputFile = cms.string(""),
InputFolderName = cms.string("Egamma/Electrons"),
Expand Down
2 changes: 1 addition & 1 deletion ...hes/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronGeneralAnalyzer_cfi.py
View file
Expand Up @@ -4,7 +4,7 @@
dqmElectronGeneralAnalysis = cms.EDAnalyzer("ElectronGeneralAnalyzer",

Verbosity = cms.untracked.int32(0),
FinalStep = cms.string("AtRunEnd"),
FinalStep = cms.string("AtJobEnd"),
InputFile = cms.string(""),
OutputFile = cms.string(""),
InputFolderName = cms.string("Egamma/Electrons/General"),
Expand Down
2 changes: 1 addition & 1 deletion branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronOfflineClient_cfi.py
View file
Expand Up @@ -6,7 +6,7 @@
dqmElectronOfflineClient = cms.EDAnalyzer("ElectronOfflineClient",

Verbosity = cms.untracked.int32(0),
FinalStep = cms.string("AtRunEnd"),
FinalStep = cms.string("AtJobEnd"),
InputFile = cms.string(""),
OutputFile = cms.string(""),
InputFolderName = cms.string("Egamma/Electrons"),
Expand Down
2 changes: 1 addition & 1 deletion ...es/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronTagProbeAnalyzer_cfi.py
View file
Expand Up @@ -7,7 +7,7 @@
dqmElectronTagProbeAnalysis = cms.EDAnalyzer("ElectronTagProbeAnalyzer",

Verbosity = cms.untracked.int32(0),
FinalStep = cms.string("AtRunEnd"),
FinalStep = cms.string("AtJobEnd"),
InputFile = cms.string(""),
OutputFile = cms.string(""),
InputFolderName = cms.string("Egamma/Electrons/TagAndProbe"),
Expand Down
23 changes: 13 additions & 10 deletions branches/revert-7710-hcal_infinte_loop/DQMServices/Core/interface/DQMStore.h
View file
Expand Up @@ -19,6 +19,7 @@
# include <stdio.h>
# include <stdlib.h>
# include <cxxabi.h>
# include <iosfwd>

namespace edm { class DQMHttpSource; class ParameterSet; class ActivityRegistry;}
namespace lat { class Regexp; }
Expand All @@ -42,6 +43,7 @@ class TProfile;
class TProfile2D;
class TNamed;


/** Implements RegEx patterns which occur often in a high-performant
mattern. For all other expressions, the full RegEx engine is used.
Note: this class can only be used for lat::Regexp::Wildcard-like
Expand Down Expand Up @@ -654,17 +656,17 @@ class DQMStore
MonitorElement * bookProfile(const std::string &dir, const std::string &name, TProfile *h);
MonitorElement * bookProfile2D(const std::string &folder, const std::string &name, TProfile2D *h);

static bool checkBinningMatches(MonitorElement *me, TH1 *h);
static bool checkBinningMatches(MonitorElement *me, TH1 *h, unsigned verbose);

static void collate1D(MonitorElement *me, TH1F *h);
static void collate1S(MonitorElement *me, TH1S *h);
static void collate1DD(MonitorElement *me, TH1D *h);
static void collate2D(MonitorElement *me, TH2F *h);
static void collate2S(MonitorElement *me, TH2S *h);
static void collate2DD(MonitorElement *me, TH2D *h);
static void collate3D(MonitorElement *me, TH3F *h);
static void collateProfile(MonitorElement *me, TProfile *h);
static void collateProfile2D(MonitorElement *me, TProfile2D *h);
static void collate1D(MonitorElement *me, TH1F *h, unsigned verbose);
static void collate1S(MonitorElement *me, TH1S *h, unsigned verbose);
static void collate1DD(MonitorElement *me, TH1D *h, unsigned verbose);
static void collate2D(MonitorElement *me, TH2F *h, unsigned verbose);
static void collate2S(MonitorElement *me, TH2S *h, unsigned verbose);
static void collate2DD(MonitorElement *me, TH2D *h, unsigned verbose);
static void collate3D(MonitorElement *me, TH3F *h, unsigned verbose);
static void collateProfile(MonitorElement *me, TProfile *h, unsigned verbose);
static void collateProfile2D(MonitorElement *me, TProfile2D *h, unsigned verbose);

// --- Operations on MEs that are normally reset at end of monitoring cycle ---
void setAccumulate(MonitorElement *me, bool flag);
Expand Down Expand Up @@ -695,6 +697,7 @@ class DQMStore
uint32_t run_;
uint32_t streamId_;
uint32_t moduleId_;
std::ofstream * stream_;

std::string pwd_;
MEMap data_;
Expand Down
5 changes: 0 additions & 5 deletions branches/revert-7710-hcal_infinte_loop/DQMServices/Core/interface/MonitorElement.h
View file
Expand Up @@ -378,8 +378,3 @@ class MonitorElement
};

#endif // DQMSERVICES_CORE_MONITOR_ELEMENT_H

/* Local Variables: */
/* show-trailing-whitespace: t */
/* truncate-lines: t */
/* End: */

0 comments on commit 2778861

Please sign in to comment.