Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
centrality
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Oleksii Lubynets
centrality
Commits
0ee4a91d
Commit
0ee4a91d
authored
6 years ago
by
Viktor Klochkov
Browse files
Options
Downloads
Patches
Plain Diff
update doxygen documentation
parent
2e09a20b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
glauber/Fitter.cpp
+17
-18
17 additions, 18 deletions
glauber/Fitter.cpp
glauber/Fitter.h
+1
-1
1 addition, 1 deletion
glauber/Fitter.h
glauber/FitterHelper.h
+1
-1
1 addition, 1 deletion
glauber/FitterHelper.h
glauber/main.cpp
+4
-107
4 additions, 107 deletions
glauber/main.cpp
with
23 additions
and
127 deletions
glauber/Fitter.cpp
+
17
−
18
View file @
0ee4a91d
...
...
@@ -141,10 +141,10 @@ void Glauber::Fitter::NormalizeGlauberFit ()
*
* @param mu mean value of negative binominal distribution (we are looking for it)
* @param chi2 return value (indicates good match)
* @param mu_min lower search edge
* @param mu_max upper search edge
* @param mu_min lower search edge
for mean value NBD
* @param mu_max upper search edge
for mean value NBD
* @param f parameter of Na
* @param k
??
* @param k
NBD parameter
* @param nEvents
* @param nIter
*/
...
...
@@ -197,11 +197,10 @@ void Glauber::Fitter::FindMuGoldenSection (float *mu, float *chi2, float mu_min,
/**
* Find the best match
*
* @param nf amount of f-steps
* @param f0 lower edge (of what)
* @param f1 upper edge (of what)
* @param nsigma amount of sigma-steps
* @param SigmaStep ??
* @param return value of best fit parameters
* @param f0 parameter of Na, for which chi2 will be calculated
* @param k0 lower search edge for NBD parameter
* @param k1 upper search edge for NBD parameter
* @param nEvents
*/
float
Glauber
::
Fitter
::
FitGlauber
(
float
*
par
,
Float_t
f0
,
Int_t
k0
,
Int_t
k1
,
Int_t
nEvents
)
...
...
@@ -254,17 +253,10 @@ float Glauber::Fitter::FitGlauber (float *par, Float_t f0, Int_t k0, Int_t k1, I
}
}
// std::cout << " Total number of events = " << fGlauberFitHisto.Integral(0, fNbins) << std::endl;
tree
->
Write
();
file
->
Write
();
file
->
Close
();
// tree->Delete();
// file->Delete();
// std::cout << "f = " << f_fit << " mu = " << mu_fit << " k = " << k_fit << " Chi2Min = " << Chi2Min << std::endl;
par
[
0
]
=
f_fit
;
par
[
1
]
=
mu_fit
;
par
[
2
]
=
k_fit
;
...
...
@@ -274,7 +266,7 @@ float Glauber::Fitter::FitGlauber (float *par, Float_t f0, Int_t k0, Int_t k1, I
/**
* Compare fGlauberFitHisto with fDataHisto
* @return
* @return
chi2 value
*/
float
Glauber
::
Fitter
::
GetChi2
()
const
{
...
...
@@ -322,7 +314,7 @@ void Glauber::Fitter::SetNBDhist(float mu, float k)
* @param n argument
* @param mu mean
* @param k argument
* @return
* @return
NBD for a given parameters
*/
float
Glauber
::
Fitter
::
NBD
(
float
n
,
float
mu
,
float
k
)
const
{
...
...
@@ -348,7 +340,14 @@ float Glauber::Fitter::NBD(float n, float mu, float k) const
return
F
;
}
/**
* Creates histo with a given model parameter distribution
* @param range observable range
* @param name name of the MC-Glauber model parameter
* @param par array with fit parameters
* @param Nevents
* @return pointer to the histogram
*/
std
::
unique_ptr
<
TH1F
>
Glauber
::
Fitter
::
GetModelHisto
(
const
float
range
[
2
],
TString
name
,
const
float
par
[
3
],
int
nEvents
)
{
const
float
f
=
par
[
0
];
...
...
This diff is collapsed.
Click to expand it.
glauber/Fitter.h
+
1
−
1
View file @
0ee4a91d
/** @file Fitter.h
@class Glauber::Fitter
@author Viktor Klochkov (klochkov44@gmail.com)
@
date August 2018
@
author Ilya Selyuzhenkov (ilya.selyuzhenkov@gmail.com)
@brief Class to fit histo with Glauber based function
*/
...
...
This diff is collapsed.
Click to expand it.
glauber/FitterHelper.h
+
1
−
1
View file @
0ee4a91d
/** @file FitterHelper.h
@author Viktor Klochkov (klochkov44@gmail.com)
@
date August 2018
@
author Ilya Selyuzhenkov (ilya.selyuzhenkov@gmail.com)
@brief Methods for fit QA
*/
...
...
This diff is collapsed.
Click to expand it.
glauber/main.cpp
+
4
−
107
View file @
0ee4a91d
...
...
@@ -71,114 +71,11 @@ int main(int argc, char *argv[])
Glauber
::
DrawHistos
(
fitter
,
true
,
true
,
true
,
true
);
// const float range[2] = {99.257812, 160.};
// const float par[3] = {1,0.299188,17};
// for (int i=0; i<5; ++i)
// {
// std::unique_ptr<TH1F> hB(fitter.GetModelHisto (range, "Npart", par, 1000000));
// hB->SaveAs( "b_test.root" );
// }
const
float
range
[
2
]
=
{
100
,
160.
};
std
::
unique_ptr
<
TH1F
>
hB
(
fitter
.
GetModelHisto
(
range
,
"Npart"
,
par
,
100000
));
hB
->
SaveAs
(
"b_test.root"
);
std
::
cout
<<
"END!"
<<
std
::
endl
;
return
0
;
}
// int main(int argc, char *argv[])
// {
//
// const Float_t f0 = atof( argv[1]);
// const Float_t f1 = atof( argv[1]);
// const Int_t nsigma = atoi( argv[2] );
//
// TString glauber_filename = "~/Data/GlauberModel/PbPb/30AGeV/glau_pbpb_ntuple_signn_31.0_7.6AGeV_CM_30AGeV_LC.root";
// TString qa_filename = "/home/vklochkov/Data/na61/na61_30_qa.root";
// TString histoname = "reco_info/hMreco";
//
// const Int_t BinMin = atoi( argv[3] );
// const Int_t BinMax = 400;
//
// const Int_t nf = 1;
// const Int_t nEvents = 199000;
//
//
// TString treename = "nt_Pb_Pb";
//
// std::unique_ptr<TFile> fSimFile{TFile::Open (glauber_filename.Data(), "read")};
// std::unique_ptr<TTree> fSimTree{(TTree*) fSimFile->Get(treename.Data())};
//
// std::unique_ptr<TFile> f{TFile::Open( qa_filename.Data() )};
// // TH1F *hData1 = (TH1F*)f->Get("reco_info/hE");
// TH1F *hData1 = (TH1F*)f->Get( histoname );
//
// Fitter fitter ( std::move(fSimTree) );
//
// // fitter.SetMode("PSD");
// fitter.SetInputHisto (*hData1);
// fitter.SetBinSize (1);
// fitter.Init (nEvents);
//
// TString OutDir = ".";
//
// fitter.SetFitMinBin (BinMin);
// fitter.SetFitMaxBin (BinMax);
// fitter.SetOutDirName (OutDir);
//
// float par[3];
// // fitter.FitGlauber(par, nf, f0, f1, nsigma, nEvents);
// // Glauber::DrawHistos(fitter, true, true, true, true);
//
// const float mu[11] = {0.7,0.7,0.7,0.7,0.7,0.7,0.7,0.7,0.7,0.7,0.7};
// const float k[11] = {1,3,5,7,9,12,15,18,21,30,1000};
//
// TFile fout("test_nbd.root", "recreate");
//
// for (int i=0; i<11; ++i)
// {
// fitter.SetNBDhist(mu[i], k[i]);
// fitter.GetNBDHisto().Write();
//
// fitter.SetGlauberFitHisto (1, mu[i], k[i], nEvents, false);
// fitter.GetGlauberFitHisto().Write();
// }
//
// const float range[2] = {100., 150.};
// // const float par[3] = {1,0.76,70};
//
// // std::unique_ptr<TH1F> hB(fitter.GetModelHisto (range, "B", par, 100000));
// // hB->SaveAs("test_b.root");
//
// std::cout << "END!" << std::endl;
//
// return 0;
// }
//
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment