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

Back port analysis changes from ROOT6 IB #8292

Merged
merged 1 commit into from Mar 14, 2015
Merged

Back port analysis changes from ROOT6 IB #8292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ElectroWeakAnalysis/ZMuMu/plugins/ZMuMuIsolationAnalyzer.cc
View file
Open in desktop
Expand Up @@ -62,7 +62,7 @@ class ZMuMuIsolationAnalyzer : public edm::EDAnalyzer {
template<typename T>
MuTag muTag(const T & mu) const;
void Deposits(const pat::IsoDeposit* isodep, double dR_max, TH1F* hist);
void histo(const TH1F* hist, const char* cx, const char* cy) const;
void histo(TH1F* hist, const char* cx, const char* cy) const;
};

template<typename T>
Expand Down Expand Up @@ -114,7 +114,7 @@ void ZMuMuIsolationAnalyzer::Deposits(const pat::IsoDeposit* isodep,double dR_ma
}
}

void ZMuMuIsolationAnalyzer::histo(const TH1F* hist, const char* cx, const char*cy) const{
void ZMuMuIsolationAnalyzer::histo(TH1F* hist, const char* cx, const char*cy) const{
hist->GetXaxis()->SetTitle(cx);
hist->GetYaxis()->SetTitle(cy);
hist->GetXaxis()->SetTitleOffset(1);
Expand Down
4 changes: 2 additions & 2 deletions ElectroWeakAnalysis/ZMuMu/plugins/ZMuMuSaMassHistogram.cc
View file
Open in desktop
Expand Up @@ -46,10 +46,10 @@ class ZMuMuSaMassHistogram : public edm::EDAnalyzer {
double min, max;
int Nbin;
TH1F * ZMassSa;
void histo(const TH1F* hist, char* cx, char* cy) const;
void histo(TH1F* hist, char* cx, char* cy) const;
};

void ZMuMuSaMassHistogram::histo(const TH1F* hist,char* cx, char*cy) const{
void ZMuMuSaMassHistogram::histo(TH1F* hist,char* cx, char*cy) const{
hist->GetXaxis()->SetTitle(cx);
hist->GetYaxis()->SetTitle(cy);
hist->GetXaxis()->SetTitleOffset(1);
Expand Down
2 changes: 1 addition & 1 deletion MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitUtils.cc
View file
Open in desktop
Expand Up @@ -1131,7 +1131,7 @@ void MuScleFitUtils::minimizeLikelihood()
{
// Output file with fit parameters resulting from minimization
// -----------------------------------------------------------
ofstream FitParametersFile;
std::ofstream FitParametersFile;
FitParametersFile.open ("FitParameters.txt", std::ios::app);
FitParametersFile << "Fitting with resolution, scale, bgr function # "
<< ResolFitType << " " << ScaleFitType << " " << BgrFitType
Expand Down
2 changes: 1 addition & 1 deletion MuonAnalysis/MomentumScaleCalibration/src/BackgroundFunction.cc
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ void BackgroundFunction::readParameters( TString fileName )
// std::vector<double> parameterErrors;

// Read the parameters file
ifstream parametersFile(fileName.Data());
std::ifstream parametersFile(fileName.Data());
std::string line;

std::string iteration("Iteration ");
Expand Down
1 change: 0 additions & 1 deletion PhysicsTools/ParallelAnalysis/interface/TrackAnalysisAlgorithm.h
View file
Open in desktop
Expand Up @@ -37,5 +37,4 @@ namespace examples {

}

template<> atomic_TClass_ptr TFWLiteSelector<examples::TrackAnalysisAlgorithm>::fgIsA;
#endif
18 changes: 9 additions & 9 deletions PhysicsTools/Utilities/interface/LumiReweightingStandAlone.h
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
\authors Salvatore Rappoccio, Mike Hildreth
*/

#include "TH1.h"
#include "TH1F.h"
#include "TH3.h"
#include "TFile.h"
#include "TRandom1.h"
Expand Down Expand Up @@ -241,21 +241,21 @@ namespace reweight {
generatedFile_ = new TFile( generatedFileName_.c_str() ) ; //MC distribution
dataFile_ = new TFile( dataFileName_.c_str() ); //Data distribution

Data_distr_ = new TH1( *(static_cast<TH1*>(dataFile_->Get( DataHistName_.c_str() )->Clone() )) );
MC_distr_ = new TH1( *(static_cast<TH1*>(generatedFile_->Get( GenHistName_.c_str() )->Clone() )) );
Data_distr_ = new TH1F( *(static_cast<TH1F*>(dataFile_->Get( DataHistName_.c_str() )->Clone() )) );
MC_distr_ = new TH1F( *(static_cast<TH1F*>(generatedFile_->Get( GenHistName_.c_str() )->Clone() )) );

// normalize both histograms first

Data_distr_->Scale( 1.0/ Data_distr_->Integral() );
MC_distr_->Scale( 1.0/ MC_distr_->Integral() );

weights_ = new TH1( *(Data_distr_)) ;
weights_ = new TH1F( *(Data_distr_)) ;

// MC * data/MC = data, so the weights are data/MC:

weights_->SetName("lumiWeights");

TH1* den = new TH1(*(MC_distr_));
TH1F* den = new TH1F(*(MC_distr_));

weights_->Divide( den ); // so now the average weight should be 1.0

Expand Down Expand Up @@ -294,7 +294,7 @@ namespace reweight {
Data_distr_ = new TH1F("Data_distr","Data dist",NBins,-0.5, float(NBins)-0.5);

weights_ = new TH1F("luminumer","luminumer",NBins,-0.5, float(NBins)-0.5);
TH1* den = new TH1F("lumidenom","lumidenom",NBins,-0.5, float(NBins)-0.5);
TH1F* den = new TH1F("lumidenom","lumidenom",NBins,-0.5, float(NBins)-0.5);

for(int ibin = 1; ibin<NBins+1; ++ibin ) {
weights_->SetBinContent(ibin, Lumi_distr[ibin-1]);
Expand Down Expand Up @@ -1402,11 +1402,11 @@ namespace reweight {
std::string DataHistName_;
TFile *generatedFile_;
TFile *dataFile_;
TH1 *weights_;
TH1F *weights_;

//keep copies of normalized distributions:
TH1* MC_distr_;
TH1* Data_distr_;
TH1F* MC_distr_;
TH1F* Data_distr_;

double WeightOOTPU_[25][25];
double Weight3D_[50][50][50];
Expand Down