Skip to content

Please consider the following formatting changes to #9867 #392

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

Merged
ddobrigk merged 1 commit into from
Feb 11, 2025
Merged

Please consider the following formatting changes to #9867 #392

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Common/Tools/Multiplicity/multGlauberNBDFitter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
fFitNpx(5000)
{
// Constructor
fNpart = new Double_t[fMaxNpNcPairs];

Check warning on line 62 in Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
fNcoll = new Double_t[fMaxNpNcPairs];

Check warning on line 63 in Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
fContent = new Long_t[fMaxNpNcPairs];

Check warning on line 64 in Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.

//Ancestor histo
fhNanc = new TH1D("fhNanc", "", 1000, -0.5, 999.5);
Expand Down Expand Up @@ -106,9 +106,9 @@
fFitNpx(5000)
{
//Named constructor
fNpart = new Double_t[fMaxNpNcPairs];

Check warning on line 109 in Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
fNcoll = new Double_t[fMaxNpNcPairs];

Check warning on line 110 in Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
fContent = new Long_t[fMaxNpNcPairs];

Check warning on line 111 in Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.

//Ancestor histo
//fhNanc = new TH1D("fhNanc", "", fAncestorMode==2?10000:1000, -0.5, 999.5);
Expand Down Expand Up @@ -156,13 +156,13 @@
}

//______________________________________________________
Double_t multGlauberNBDFitter::ProbDistrib(Double_t* x, Double_t* par)

Check warning on line 159 in Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
//Master fitter function
{
Double_t lMultValue = x[0];

Check warning on line 162 in Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
Double_t lProbability = 0.0;

Check warning on line 163 in Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
ffChanged = kTRUE;
const Double_t lAlmost0 = 1.e-13;

Check warning on line 165 in Common/Tools/Multiplicity/multGlauberNBDFitter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity] 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
//Comment this line in order to make the code evaluate Nancestor all the time
if (TMath::Abs(fCurrentf - par[2]) < lAlmost0)
ffChanged = kFALSE;
Expand Down Expand Up @@ -309,7 +309,7 @@
fk = fGlauberNBD->GetParameter(1);
ff = fGlauberNBD->GetParameter(2);
fnorm = fGlauberNBD->GetParameter(3);
fdMu = fGlauberNBD->GetParameter(4);
fdMu = fGlauberNBD->GetParameter(4);

return fitptr.Get()->IsValid();
}
Expand Down Expand Up @@ -373,30 +373,30 @@
void multGlauberNBDFitter::CalculateAvNpNc(TProfile* lNPartProf, TProfile* lNCollProf, TH2F* lNPart2DPlot, TH2F* lNColl2DPlot, TH1F* hPercentileMap, Double_t lLoRange, Double_t lHiRange)
{
cout << "Calculating <Npart>, <Ncoll> in centrality bins..." << endl;
cout << "Range to calculate: "<<lLoRange<<" to "<<lHiRange<<endl;
cout << "Range to calculate: " << lLoRange << " to " << lHiRange << endl;

cout << "Acquiring values from the fit function..."<<endl;
cout << "Acquiring values from the fit function..." << endl;

fMu = fGlauberNBD->GetParameter(0);
fk = fGlauberNBD->GetParameter(1);
ff = fGlauberNBD->GetParameter(2);
fnorm = fGlauberNBD->GetParameter(3);
fdMu = fGlauberNBD->GetParameter(4);
fMu = fGlauberNBD->GetParameter(0);
fk = fGlauberNBD->GetParameter(1);
ff = fGlauberNBD->GetParameter(2);
fnorm = fGlauberNBD->GetParameter(3);
fdMu = fGlauberNBD->GetParameter(4);

cout << "Please inspect now: "<<endl;
cout << "Glauber NBD mu ............: "<<fMu<<endl;
cout << "Glauber NBD k .............: "<<fk<<endl;
cout << "Glauber NBD f .............: "<<ff<<endl;
cout << "Glauber NBD norm ..........: "<<fnorm<<endl;
cout << "Glauber NBD dmu/dNanc .....: "<<fdMu<<endl;
cout << "Please inspect now: " << endl;
cout << "Glauber NBD mu ............: " << fMu << endl;
cout << "Glauber NBD k .............: " << fk << endl;
cout << "Glauber NBD f .............: " << ff << endl;
cout << "Glauber NBD norm ..........: " << fnorm << endl;
cout << "Glauber NBD dmu/dNanc .....: " << fdMu << endl;

//2-fold nested loop:
// + looping over all Nancestor combinations
// + looping over all possible final multiplicities
// ^---> final product already multiplicity-binned

//______________________________________________________
if( lLoRange < -1 && lHiRange < -1){
if (lLoRange < -1 && lHiRange < -1) {
fGlauberNBD->GetRange(lLoRange, lHiRange);
}
// bypass to zero
Expand Down
Loading