Skip to content

Commit

Permalink
kCanRebin is not supported in ROOT6
Browse files Browse the repository at this point in the history
  • Loading branch information
@wmtan
wmtan committed Jul 14, 2015
1 parent 64d7c33 commit 37d3cbf
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 50 deletions.
22 changes: 11 additions & 11 deletions Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ bool MillePedeMonitor::init(TDirectory *directory)
(new TH2F("derivativesVsPhi",
"derivatives vs. #phi;#phi(geomDet);#partial(x/y)_{local}/#partial(param)",
50, -TMath::Pi(), TMath::Pi(), 101, -300., 300.));
// myTrajectoryHists2D.back()->SetBit(TH1::kCanRebin);
// myTrajectoryHists2D.back()->SetCanExtend(TH1::kAllAxes);

TDirectory *dirTraject = directory->mkdir("refTrajectoryHists", "ReferenceTrajectory's");
this->addToDirectory(myTrajectoryHists2D, dirTraject);
Expand Down Expand Up @@ -344,12 +344,12 @@ bool MillePedeMonitor::init(TDirectory *directory)
// Here for x-measurements:
std::vector<TH1*> allResidHistsX;
allResidHistsX.push_back(new TH1F("resid", "hit residuals;residuum [cm]", 101,-.5,.5));//51,-.05, .05));
//allResidHistsX.back()->SetBit(TH1::kCanRebin);
//allResidHistsX.back()->SetCanExtend(TH1::kAllAxes);
allResidHistsX.push_back(new TH1F("sigma", "hit uncertainties;#sigma [cm]", 100,0.,1.));//50, 0., .02));
//allResidHistsX.back()->SetBit(TH1::kCanRebin);
//allResidHistsX.back()->SetCanExtend(TH1::kAllAxes);
allResidHistsX.push_back(new TH1F("reduResid", "reduced hit residuals;res./#sigma",
101, -10., 10.));//51, -3., 3.));
// allResidHistsX.back()->SetBit(TH1::kCanRebin);
// allResidHistsX.back()->SetCanExtend(TH1::kAllAxes);
allResidHistsX.push_back(new TH1F("angle", "#phi_{tr} wrt normal (sens. plane);#phi_{n}^{sens}",
50, 0., TMath::PiOver2()));
allResidHistsX.push_back(new TH2F("residVsAngle",
Expand All @@ -366,23 +366,23 @@ bool MillePedeMonitor::init(TDirectory *directory)
allResidHistsX.push_back(new TH1F("residGt45",
"hit residuals (#phi_{n}^{sens}>45#circ);residuum [cm]",
101, -.5, .5));//51, -.05, .05));
// allResidHistsX.back()->SetBit(TH1::kCanRebin);
// allResidHistsX.back()->SetCanExtend(TH1::kAllAxes);
allResidHistsX.push_back(new TH1F("sigmaGt45",
"hit uncertainties(#phi_{n}^{sens}>45#circ);#sigma [cm]",
100, 0., 1.));//50, 0., .02));
// allResidHistsX.back()->SetBit(TH1::kCanRebin);
// allResidHistsX.back()->SetCanExtend(TH1::kAllAxes);
allResidHistsX.push_back(new TH1F("reduResidGt45",
"reduced hit residuals(#phi_{n}^{sens}>45#circ);res./#sigma",
101, -10., 10.));//51,-3.,3.));
// allResidHistsX.back()->SetBit(TH1::kCanRebin);
// allResidHistsX.back()->SetCanExtend(TH1::kAllAxes);
allResidHistsX.push_back(new TH1F("residLt45",
"hit residuals (#phi_{n}^{sens}<45#circ);residuum [cm]",
101, -.5, .5));//51, -.15, .15));
// allResidHistsX.back()->SetBit(TH1::kCanRebin);
// allResidHistsX.back()->SetCanExtend(TH1::kAllAxes);
allResidHistsX.push_back(new TH1F("sigmaLt45",
"hit uncertainties(#phi_{n}^{sens}<45#circ);#sigma [cm]",
100, 0., 1.));//50, 0., .01));
// allResidHistsX.back()->SetBit(TH1::kCanRebin);
// allResidHistsX.back()->SetCanExtend(TH1::kAllAxes);
allResidHistsX.push_back(new TH1F("reduResidLt45",
"reduced hit residuals(#phi_{n}^{sens}<45#circ);res./#sigma",
101, -10., 10.));//51,-3.,3.));
Expand Down Expand Up @@ -445,12 +445,12 @@ bool MillePedeMonitor::init(TDirectory *directory)
(new TH2F(Form("frame2framePhi%d%d", i, j),
Form("frame to frame derivatives, %d%d;#phi(aliDet);deriv",i,j),
51, -TMath::Pi(), TMath::Pi(), 10, 0., 1.));
myFrame2FrameHists2D.back()->SetBit(TH1::kCanRebin);
myFrame2FrameHists2D.back()->SetCanExtend(TH1::kAllAxes);
myFrame2FrameHists2D.push_back
(new TH2F(Form("frame2frameR%d%d", i, j),
Form("frame to frame derivatives, %d%d;r(aliDet);deriv",i,j),
51, 0., 110., 10, 0., 1.));
myFrame2FrameHists2D.back()->SetBit(TH1::kCanRebin);
myFrame2FrameHists2D.back()->SetCanExtend(TH1::kAllAxes);

myFrame2FrameHists2D.push_back
(new TH2F(Form("frame2framePhiLog%d%d", i, j),
Expand Down
10 changes: 5 additions & 5 deletions CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,9 @@ SiStripApvGain * SiStripGainCosmicCalculator::getNewObject() {

std::cout<<"total_nr_of_events="<<total_nr_of_events<<std::endl;
// book some more histograms
TH1F *ChargeOfEachAPVPair = new TH1F("ChargeOfEachAPVPair","ChargeOfEachAPVPair",1,0,1); ChargeOfEachAPVPair->SetBit(TH1::kCanRebin);
TH1F *EntriesApvPairs = new TH1F("EntriesApvPairs","EntriesApvPairs",1,0,1); EntriesApvPairs->SetBit(TH1::kCanRebin);
TH1F * NrOfEntries = new TH1F("NrOfEntries","NrOfEntries",351,-0.5,350.5);// NrOfEntries->SetBit(TH1::kCanRebin);
TH1F *ChargeOfEachAPVPair = new TH1F("ChargeOfEachAPVPair","ChargeOfEachAPVPair",1,0,1); ChargeOfEachAPVPair->SetCanExtend(TH1::kAllAxes);
TH1F *EntriesApvPairs = new TH1F("EntriesApvPairs","EntriesApvPairs",1,0,1); EntriesApvPairs->SetCanExtend(TH1::kAllAxes);
TH1F * NrOfEntries = new TH1F("NrOfEntries","NrOfEntries",351,-0.5,350.5);// NrOfEntries->SetCanExtend(TH1::kAllAxes);
TH1F * ModuleThickness = new TH1F("ModuleThickness","ModuleThickness",2,0.5,2.5); HlistOtherHistos->Add(ModuleThickness);
ModuleThickness->GetXaxis()->SetBinLabel(1,"320mu"); ModuleThickness->GetXaxis()->SetBinLabel(2,"500mu"); ModuleThickness->SetYTitle("Nr APVPairs");
TH1F * ModuleWidth = new TH1F("ModuleWidth","ModuleWidth",5,0.5,5.5); HlistOtherHistos->Add(ModuleWidth);
Expand Down Expand Up @@ -323,8 +323,8 @@ SiStripApvGain * SiStripGainCosmicCalculator::getNewObject() {
MeanCharge = MeanCharge / NrOfApvPairs;
// calculate correction
TH1F* CorrectionOfEachAPVPair = (TH1F*) ChargeOfEachAPVPair->Clone("CorrectionOfEachAPVPair");
TH1F *ChargeOfEachAPVPairControlView = new TH1F("ChargeOfEachAPVPairControlView","ChargeOfEachAPVPairControlView",1,0,1); ChargeOfEachAPVPairControlView->SetBit(TH1::kCanRebin);
TH1F *CorrectionOfEachAPVPairControlView = new TH1F("CorrectionOfEachAPVPairControlView","CorrectionOfEachAPVPairControlView",1,0,1); CorrectionOfEachAPVPairControlView->SetBit(TH1::kCanRebin);
TH1F *ChargeOfEachAPVPairControlView = new TH1F("ChargeOfEachAPVPairControlView","ChargeOfEachAPVPairControlView",1,0,1); ChargeOfEachAPVPairControlView->SetCanExtend(TH1::kAllAxes);
TH1F *CorrectionOfEachAPVPairControlView = new TH1F("CorrectionOfEachAPVPairControlView","CorrectionOfEachAPVPairControlView",1,0,1); CorrectionOfEachAPVPairControlView->SetCanExtend(TH1::kAllAxes);
std::ofstream APVPairTextOutput("apvpair_corrections.txt");
APVPairTextOutput<<"# MeanCharge = "<<MeanCharge<<std::endl;
APVPairTextOutput<<"# Nr. of APVPairs = "<<NrOfApvPairs<<std::endl;
Expand Down
2 changes: 1 addition & 1 deletion CondCore/RPCPlugins/plugins/RPCObVmonPyWrapper.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ namespace cond {
gStyle->SetPalette(1);

TH1D *vDistr=new TH1D("vDistr","IOV-averaged HV Distribution;Average HV (V);Entries/0.2 #muA",100,5000.,10000.);
TH1D *rmsDistr=new TH1D("rmsDistr","RMS over IOV-HV Distribution;HV RMS (V);Entries/0.2 #muA",1000,0.,1000.);//rmsDistr->SetBit(TH1::kCanRebin);
TH1D *rmsDistr=new TH1D("rmsDistr","RMS over IOV-HV Distribution;HV RMS (V);Entries/0.2 #muA",1000,0.,1000.);//rmsDistr->SetCanExtend(TH1::kAllAxes);

//BEGIN OF NEW DB-SESSION PART
//hardcoded values
Expand Down
18 changes: 9 additions & 9 deletions DQMServices/Components/plugins/EDMtoMEConverter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ EDMtoMEConverter::getData(T& iGetFrom, bool iEndRun)
// define new monitor element
if (dbe) {
me1[i] = dbe->get(dir+"/"+metoedmobject[i].object.GetName());
if (me1[i] && me1[i]->getTH1F() && me1[i]->getTH1F()->TestBit(TH1::kCanRebin) == true) {
if (me1[i] && me1[i]->getTH1F() && me1[i]->getTH1F()->CanExtendAllAxes()) {
TList list;
list.Add(&metoedmobject[i].object);
if (me1[i]->getTH1F()->Merge(&list) == -1)
Expand Down Expand Up @@ -245,7 +245,7 @@ EDMtoMEConverter::getData(T& iGetFrom, bool iEndRun)
// define new monitor element
if (dbe) {
me1[i] = dbe->get(dir+"/"+metoedmobject[i].object.GetName());
if (me1[i] && me1[i]->getTH1S() && me1[i]->getTH1S()->TestBit(TH1::kCanRebin) == true) {
if (me1[i] && me1[i]->getTH1S() && me1[i]->getTH1S()->CanExtendAllAxes()) {
TList list;
list.Add(&metoedmobject[i].object);
if (me1[i]->getTH1S()->Merge(&list) == -1)
Expand Down Expand Up @@ -304,7 +304,7 @@ EDMtoMEConverter::getData(T& iGetFrom, bool iEndRun)
// define new monitor element
if (dbe) {
me1[i] = dbe->get(dir+"/"+metoedmobject[i].object.GetName());
if (me1[i] && me1[i]->getTH1D() && me1[i]->getTH1D()->TestBit(TH1::kCanRebin) == true) {
if (me1[i] && me1[i]->getTH1D() && me1[i]->getTH1D()->CanExtendAllAxes()) {
TList list;
list.Add(&metoedmobject[i].object);
if (me1[i]->getTH1D()->Merge(&list) == -1)
Expand Down Expand Up @@ -363,7 +363,7 @@ EDMtoMEConverter::getData(T& iGetFrom, bool iEndRun)
// define new monitor element
if (dbe) {
me2[i] = dbe->get(dir+"/"+metoedmobject[i].object.GetName());
if (me2[i] && me2[i]->getTH2F() && me2[i]->getTH2F()->TestBit(TH1::kCanRebin) == true) {
if (me2[i] && me2[i]->getTH2F() && me2[i]->getTH2F()->CanExtendAllAxes()) {
TList list;
list.Add(&metoedmobject[i].object);
if (me2[i]->getTH2F()->Merge(&list) == -1)
Expand Down Expand Up @@ -422,7 +422,7 @@ EDMtoMEConverter::getData(T& iGetFrom, bool iEndRun)
// define new monitor element
if (dbe) {
me2[i] = dbe->get(dir+"/"+metoedmobject[i].object.GetName());
if (me2[i] && me2[i]->getTH2S() && me2[i]->getTH2S()->TestBit(TH1::kCanRebin) == true) {
if (me2[i] && me2[i]->getTH2S() && me2[i]->getTH2S()->CanExtendAllAxes()) {
TList list;
list.Add(&metoedmobject[i].object);
if (me2[i]->getTH2S()->Merge(&list) == -1)
Expand Down Expand Up @@ -481,7 +481,7 @@ EDMtoMEConverter::getData(T& iGetFrom, bool iEndRun)
// define new monitor element
if (dbe) {
me2[i] = dbe->get(dir+"/"+metoedmobject[i].object.GetName());
if (me2[i] && me2[i]->getTH2D() && me2[i]->getTH2D()->TestBit(TH1::kCanRebin) == true) {
if (me2[i] && me2[i]->getTH2D() && me2[i]->getTH2D()->CanExtendAllAxes()) {
TList list;
list.Add(&metoedmobject[i].object);
if (me2[i]->getTH2D()->Merge(&list) == -1)
Expand Down Expand Up @@ -540,7 +540,7 @@ EDMtoMEConverter::getData(T& iGetFrom, bool iEndRun)
// define new monitor element
if (dbe) {
me3[i] = dbe->get(dir+"/"+metoedmobject[i].object.GetName());
if (me3[i] && me3[i]->getTH3F() && me3[i]->getTH3F()->TestBit(TH1::kCanRebin) == true) {
if (me3[i] && me3[i]->getTH3F() && me3[i]->getTH3F()->CanExtendAllAxes()) {
TList list;
list.Add(&metoedmobject[i].object);
if (me3[i]->getTH3F()->Merge(&list) == -1)
Expand Down Expand Up @@ -600,7 +600,7 @@ EDMtoMEConverter::getData(T& iGetFrom, bool iEndRun)
// define new monitor element
if (dbe) {
me4[i] = dbe->get(dir+"/"+metoedmobject[i].object.GetName());
if (me4[i] && me4[i]->getTProfile() && me4[i]->getTProfile()->TestBit(TH1::kCanRebin) == true) {
if (me4[i] && me4[i]->getTProfile() && me4[i]->getTProfile()->CanExtendAllAxes()) {
TList list;
list.Add(&metoedmobject[i].object);
if (me4[i]->getTProfile()->Merge(&list) == -1)
Expand Down Expand Up @@ -659,7 +659,7 @@ EDMtoMEConverter::getData(T& iGetFrom, bool iEndRun)
// define new monitor element
if (dbe) {
me5[i] = dbe->get(dir+"/"+metoedmobject[i].object.GetName());
if (me5[i] && me5[i]->getTProfile2D() && me5[i]->getTProfile2D()->TestBit(TH1::kCanRebin) == true) {
if (me5[i] && me5[i]->getTProfile2D() && me5[i]->getTProfile2D()->CanExtendAllAxes()) {
TList list;
list.Add(&metoedmobject[i].object);
if (me5[i]->getTProfile2D()->Merge(&list) == -1)
Expand Down
12 changes: 6 additions & 6 deletions DQMServices/Components/src/DQMProvInfo.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ DQMProvInfo::beginRun(const edm::Run& r, const edm::EventSetup &c ) {
reportSummaryMap_->setBinLabel(28,"Stable B",2);
reportSummaryMap_->setBinLabel(29,"Valid",2);
reportSummaryMap_->setAxisTitle("Luminosity Section");
reportSummaryMap_->getTH2F()->SetBit(TH1::kCanRebin);
reportSummaryMap_->getTH2F()->SetCanExtend(TH1::kAllAxes);

dbe_->cd();
dbe_->setCurrentFolder(subsystemname_ +"/LhcInfo/");
hBeamMode_=dbe_->book1D("beamMode","beamMode",XBINS,1.,XBINS+1);
hBeamMode_->getTH1F()->GetYaxis()->Set(21,0.5,21.5);
hBeamMode_->getTH1F()->SetMaximum(21.5);
hBeamMode_->getTH1F()->SetBit(TH1::kCanRebin);
hBeamMode_->getTH1F()->SetCanExtend(TH1::kAllAxes);

hBeamMode_->setAxisTitle("Luminosity Section",1);
hBeamMode_->setBinLabel(1,"no mode",2);
Expand Down Expand Up @@ -121,20 +121,20 @@ DQMProvInfo::beginRun(const edm::Run& r, const edm::EventSetup &c ) {

hLhcFill_=dbe_->book1D("lhcFill","LHC Fill Number",XBINS,1.,XBINS+1);
hLhcFill_->setAxisTitle("Luminosity Section",1);
hLhcFill_->getTH1F()->SetBit(TH1::kCanRebin);
hLhcFill_->getTH1F()->SetCanExtend(TH1::kAllAxes);

hMomentum_=dbe_->book1D("momentum","Beam Energy [GeV]",XBINS,1.,XBINS+1);
hMomentum_->setAxisTitle("Luminosity Section",1);
hMomentum_->getTH1F()->SetBit(TH1::kCanRebin);
hMomentum_->getTH1F()->SetCanExtend(TH1::kAllAxes);

hIntensity1_=dbe_->book1D("intensity1","Intensity Beam 1",XBINS,1.,XBINS+1);
hIntensity1_->setAxisTitle("Luminosity Section",1);
hIntensity1_->setAxisTitle("N [E10]",2);
hIntensity1_->getTH1F()->SetBit(TH1::kCanRebin);
hIntensity1_->getTH1F()->SetCanExtend(TH1::kAllAxes);
hIntensity2_=dbe_->book1D("intensity2","Intensity Beam 2",XBINS,1.,XBINS+1);
hIntensity2_->setAxisTitle("Luminosity Section",1);
hIntensity2_->setAxisTitle("N [E10]",2);
hIntensity2_->getTH1F()->SetBit(TH1::kCanRebin);
hIntensity2_->getTH1F()->SetCanExtend(TH1::kAllAxes);

dbe_->cd();
dbe_->setCurrentFolder(subsystemname_ +"/ProvInfo/");
Expand Down
12 changes: 6 additions & 6 deletions DQMServices/Core/src/MonitorElement.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1201,8 +1201,8 @@ MonitorElement::addProfiles(TProfile *h1, TProfile *h2, TProfile *sum, float c1,
Double_t stats2[NUM_STAT];
Double_t stats3[NUM_STAT];

bool isRebinOn = sum->TestBit(TH1::kCanRebin);
sum->ResetBit(TH1::kCanRebin);
bool isRebinOn = sum->CanExtendAllAxes();
sum->SetCanExtend(TH1::kNoAxis);

for (Int_t i = 0; i < NUM_STAT; ++i)
stats1[i] = stats2[i] = stats3[i] = 0;
Expand Down Expand Up @@ -1234,7 +1234,7 @@ MonitorElement::addProfiles(TProfile *h1, TProfile *h2, TProfile *sum, float c1,

sum->SetEntries(entries);
sum->PutStats(stats3);
if (isRebinOn) sum->SetBit(TH1::kCanRebin);
if (isRebinOn) sum->SetCanExtend(TH1::kAllAxes);
}

// implementation: [email protected]
Expand All @@ -1251,8 +1251,8 @@ MonitorElement::addProfiles(TProfile2D *h1, TProfile2D *h2, TProfile2D *sum, flo
Double_t stats2[NUM_STAT];
Double_t stats3[NUM_STAT];

bool isRebinOn = sum->TestBit(TH1::kCanRebin);
sum->ResetBit(TH1::kCanRebin);
bool isRebinOn = sum->CanExtendAllAxes();
sum->SetCanExtend(TH1::kNoAxis);

for (Int_t i = 0; i < NUM_STAT; ++i)
stats1[i] = stats2[i] = stats3[i] = 0;
Expand Down Expand Up @@ -1286,7 +1286,7 @@ MonitorElement::addProfiles(TProfile2D *h1, TProfile2D *h2, TProfile2D *sum, flo
}
sum->SetEntries(entries);
sum->PutStats(stats3);
if (isRebinOn) sum->SetBit(TH1::kCanRebin);
if (isRebinOn) sum->SetCanExtend(TH1::kAllAxes);
}

void
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Histograms/interface/MEtoEDMFormat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class MEtoEDM
std::cout << "WARNING MEtoEDM::mergeProducts(): adding new histogram '" << name << "'" << std::endl;
#endif
MEtoEdmObject.push_back(newMEtoEDMObject[i]);
} else if (MEtoEdmObject[j].object.TestBit(TH1::kCanRebin) == true && newMEtoEDMObject[i].object.TestBit(TH1::kCanRebin) == true) {
} else if (MEtoEdmObject[j].object.CanExtendAllAxes() && newMEtoEDMObject[i].object.CanExtendAllAxes()) {
TList list;
list.Add((TObject*)&newMEtoEDMObject[i].object);
if (MEtoEdmObject[j].object.Merge(&list) == -1) {
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Histograms/test/metoedmformat_t.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ namespace {
const Axis* GetYaxis() const {return &Axis::dummy;}
const Axis* GetZaxis() const {return &Axis::dummy;}

bool TestBit(unsigned int f) const{return false;}
bool CanExtendAllAxes() const{return false;}
long long Merge(void *) {return -1;}

int m_i;
Expand Down
2 changes: 1 addition & 1 deletion FWCore/ROOTTests/test/tprofile_threaded_t.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ int main(int argc, char** argv)
for(int i=0; i<kNThreads; ++i) {
std::ostringstream s;
profiles.push_back(std::unique_ptr<TProfile>(new TProfile(s.str().c_str(),s.str().c_str(), 100,10,11,0,10)));
profiles.back()->SetBit(TH1::kCanRebin);
profiles.back()->SetCanExtend(TH1::kAllAxes);
auto profile = profiles.back().get();
threads.emplace_back([i,profile,&canStart]() {
static thread_local TThread guard;
Expand Down
2 changes: 1 addition & 1 deletion FastSimulation/ParticleDecay/plugins/TestPythiaDecays.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ TestPythiaDecays::TestPythiaDecays(const edm::ParameterSet& iConfig)
strstr.str("");
strstr << "br_" << pid;
h_br[pid] = new TH1D(strstr.str().c_str(),strstr.str().c_str(),0,0,0);
h_br[pid]->SetBit(TH1::kCanRebin);
h_br[pid]->SetCanExtend(TH1::kAllAxes);
h_br_ref[pid] = (TH1D*)(h_br[pid]->Clone(strstr.str().c_str()));
h_br_ref[pid]->SetTitle(h_br_ref[pid]->GetName());
knownDecayModes[pid] = vector<string>();
Expand Down
8 changes: 4 additions & 4 deletions HLTriggerOffline/Egamma/macros/GetOptimization.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ void GetOptimization() {
}

TH1F *timingSig = new TH1F("timingSig", "Timing of Single Electron Filters in Signal Events", 6, 0, 6);
timingSig->SetBit(TH1::kCanRebin);
timingSig->SetCanExtend(TH1::kAllAxes);
timingSig->SetStats(0);
TTreeFormula *l1MatchTiming = new TTreeFormula("Timing","HLTTiming_hltCutVars_IsoTiming_EGAMMAHLT.obj.l1Match",sigEvents);
TTreeFormula *EtTiming = new TTreeFormula("Timing","HLTTiming_hltCutVars_IsoTiming_EGAMMAHLT.obj.Et",sigEvents);
Expand Down Expand Up @@ -646,7 +646,7 @@ void GetOptimization() {
timingSig->LabelsOption("v");

TH1F *timingBkg = new TH1F("timingBkg", "Timing of Single Electron Filters in Background Events", 6, 0, 6);
timingBkg->SetBit(TH1::kCanRebin);
timingBkg->SetCanExtend(TH1::kAllAxes);
timingBkg->SetStats(0);
avgL1Match = 0.;
avgEt = 0.;
Expand Down Expand Up @@ -693,7 +693,7 @@ void GetOptimization() {
delete timingBkg;

timingSig = new TH1F("timingSig", "Timing of Single Photon Filters in Signal Events", 6, 0, 6);
timingSig->SetBit(TH1::kCanRebin);
timingSig->SetCanExtend(TH1::kAllAxes);
timingSig->SetStats(0);
delete l1MatchTiming; l1MatchTiming = new TTreeFormula("Timing","HLTTiming_hltCutVars_IsoTiming_EGAMMAHLT.obj.l1Match",sigEvents);
delete EtTiming; EtTiming = new TTreeFormula("Timing","HLTTiming_hltCutVars_IsoTiming_EGAMMAHLT.obj.Et",sigEvents);
Expand Down Expand Up @@ -723,7 +723,7 @@ void GetOptimization() {
timingSig->LabelsOption("v");

timingBkg = new TH1F("timingBkg", "Timing of Single Photon Filters in Background Events", 6, 0, 6);
timingBkg->SetBit(TH1::kCanRebin);
timingBkg->SetCanExtend(TH1::kAllAxes);
timingBkg->SetStats(0);
avgL1Match = 0.;
avgEt = 0.;
Expand Down
2 changes: 1 addition & 1 deletion HeavyIonsAnalysis/Configuration/macros/fwliteExample.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void fwliteExample(bool debug=false){
TH1D *hL1TechBits = new TH1D("hL1TechBits","L1 technical trigger bits before mask",64,-0.5,63.5);
TH2D *hHfTowers = new TH2D("hHfTowers","Number of HF tower above threshold; positive side; negative side",80,-0.5,79.5,80,-0.5,79.5);
TH1D *hHLTPaths = new TH1D("hHLTPaths","HLT Paths",3,0,3);
hHLTPaths->SetBit(TH1::kCanRebin);
hHLTPaths->SetCanExtend(TH1::kAllAxes);

// vtx hists
outFile->cd(); outFile->mkdir("vtx"); outFile->cd("vtx");
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/FWLite/interface/Scanner.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ namespace fwlite {
if (hist == 0) {
if (strcmp(hname, "htemp") == 0) htempDelete();
hist = new TH1F(hname, "", gEnv->GetValue("Hist.Binning.1D.x",100), 0, 0);
hist->SetBit(TH1::kCanRebin);
hist->SetCanExtend(TH1::kAllAxes);
}
hist->SetTitle((strlen(cut) ? TString(expr)+"{"+cut+"}" : TString(expr)));
hist->GetXaxis()->SetTitle(expr);
Expand Down Expand Up @@ -322,7 +322,7 @@ namespace fwlite {
if (hist == 0) {
if (strcmp(hname, "htemp") == 0) htempDelete();
hist = new TProfile(hname, "", gEnv->GetValue("Hist.Binning.1D.x",100), 0., 0.);
hist->SetBit(TProfile::kCanRebin);
hist->SetCanExtend(TH1::kAllAxes);
}
return drawProf(xexpr, yexpr, cut, drawopt, hist);
}
Expand Down
Loading

0 comments on commit 37d3cbf

Please sign in to comment.