Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
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
atlas
athena
Commits
9b441f2f
Commit
9b441f2f
authored
1 year ago
by
Brian Cole
Browse files
Options
Downloads
Patches
Plain Diff
Fix compiler warnings re: uninitialized variables
parent
4fe5a128
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!68724
2024-02-09: Sweep 23.0 into main
,
!68466
Multiple improvements to ZDC single processing for 2023 Pb+Pb analysis/reprocessing and Run2 analyses
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCFitWrapper.h
+36
-38
36 additions, 38 deletions
ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCFitWrapper.h
ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h
+2
-2
2 additions, 2 deletions
...dDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h
with
38 additions
and
40 deletions
ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCFitWrapper.h
+
36
−
38
View file @
9b441f2f
...
...
@@ -18,19 +18,19 @@ double ZDCFermiExpFitRefl(const double* xvec, const double* pvec);
class
ATLAS_NOT_THREAD_SAFE
ZDCFitWrapper
{
private:
std
::
shared_ptr
<
TF1
>
m_wrapperTF1
;
std
::
shared_ptr
<
TF1
>
m_wrapperTF1
{}
;
float
m_tmin
;
float
m_tmax
;
float
m_tmin
{
0
}
;
float
m_tmax
{
0
}
;
float
m_ampMin
;
float
m_ampMax
;
float
m_ampMin
{
0
}
;
float
m_ampMax
{
0
}
;
float
m_t0Min
;
float
m_t0Max
;
float
m_t0Min
{
0
}
;
float
m_t0Max
{
0
}
;
bool
m_adjTLimitsEvent
;
float
m_tminAdjust
;
bool
m_adjTLimitsEvent
{
false
}
;
float
m_tminAdjust
{
0
}
;
public
:
ZDCFitWrapper
(
const
std
::
shared_ptr
<
TF1
>&
wrapperTF1
)
:
m_wrapperTF1
(
wrapperTF1
),
...
...
@@ -153,11 +153,11 @@ public:
class
ATLAS_NOT_THREAD_SAFE
ZDCFitExpFermiVariableTaus
:
public
ZDCFitWrapper
{
protected:
bool
m_fixTau1
;
bool
m_fixTau2
;
bool
m_fixTau1
{
false
}
;
bool
m_fixTau2
{
false
}
;
float
m_tau1
;
float
m_tau2
;
float
m_tau1
{
0
}
;
float
m_tau2
{
0
}
;
public
:
...
...
@@ -220,11 +220,11 @@ public:
class
ATLAS_NOT_THREAD_SAFE
ZDCFitExpFermiVariableTausLHCf
:
public
ZDCFitWrapper
{
protected:
bool
m_fixTau1
;
bool
m_fixTau2
;
bool
m_fixTau1
{
false
}
;
bool
m_fixTau2
{
false
}
;
float
m_tau1
;
float
m_tau2
;
float
m_tau1
{
0
}
;
float
m_tau2
{
0
}
;
public
:
...
...
@@ -287,13 +287,13 @@ public:
class
ATLAS_NOT_THREAD_SAFE
ZDCFitExpFermiFixedTaus
:
public
ZDCFitWrapper
{
private:
float
m_tau1
;
float
m_tau2
;
float
m_tau1
{
0
}
;
float
m_tau2
{
0
}
;
float
m_norm
;
float
m_timeCorr
;
float
m_norm
{
0
}
;
float
m_timeCorr
{
0
}
;
std
::
shared_ptr
<
TF1
>
m_expFermiFunc
=
0
;
std
::
shared_ptr
<
TF1
>
m_expFermiFunc
{}
;
public
:
...
...
@@ -350,10 +350,10 @@ public:
class
ATLAS_NOT_THREAD_SAFE
ZDCFitExpFermiPrePulse
:
public
ZDCPrePulseFitWrapper
{
private:
float
m_tau1
;
float
m_tau2
;
float
m_norm
;
float
m_timeCorr
;
float
m_tau1
{
0
}
;
float
m_tau2
{
0
}
;
float
m_norm
{
0
}
;
float
m_timeCorr
{
0
}
;
std
::
shared_ptr
<
TF1
>
m_expFermiFunc
=
0
;
public
:
...
...
@@ -416,8 +416,6 @@ public:
double
preT0
=
theTF1
->
GetParameter
(
3
);
double
deltaTPre
=
maxTime
-
preT0
;
double
deltaPresamp
=
GetTMinAdjust
()
-
preT0
;
double
background
=
preAmp
*
m_norm
*
m_expFermiFunc
->
operator
()(
deltaTPre
);
return
background
/
(
amp
+
background
);
...
...
@@ -454,12 +452,12 @@ public:
class
ATLAS_NOT_THREAD_SAFE
ZDCFitExpFermiPreExp
:
public
ZDCPreExpFitWrapper
{
private:
float
m_tau1
;
float
m_tau2
;
float
m_norm
;
float
m_timeCorr
;
float
m_tau1
{
0
}
;
float
m_tau2
{
0
}
;
float
m_norm
{
0
}
;
float
m_timeCorr
{
0
}
;
std
::
shared_ptr
<
TF1
>
m_expFermiFunc
=
0
;
std
::
shared_ptr
<
TF1
>
m_expFermiFunc
{
0
}
;
public
:
ZDCFitExpFermiPreExp
(
const
std
::
string
&
tag
,
float
tmin
,
float
tmax
,
float
tau1
,
float
tau2
,
...
...
@@ -537,12 +535,12 @@ public:
class
ATLAS_NOT_THREAD_SAFE
ZDCFitExpFermiLHCfPreExp
:
public
ZDCPreExpFitWrapper
{
private:
float
m_tau1
;
float
m_tau2
;
float
m_norm
;
float
m_timeCorr
;
float
m_tau1
{
0
}
;
float
m_tau2
{
0
}
;
float
m_norm
{
0
}
;
float
m_timeCorr
{
0
}
;
std
::
shared_ptr
<
TF1
>
m_expFermiLHCfFunc
=
0
;
std
::
shared_ptr
<
TF1
>
m_expFermiLHCfFunc
{}
;
public
:
ZDCFitExpFermiLHCfPreExp
(
const
std
::
string
&
tag
,
float
tmin
,
float
tmax
,
float
tau1
,
float
tau2
,
...
...
This diff is collapsed.
Click to expand it.
ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h
+
2
−
2
View file @
9b441f2f
...
...
@@ -145,8 +145,8 @@ private:
std
::
vector
<
float
>
m_HGT0CorrParams
;
// Parameters used to correct the fit HG times
bool
m_haveNonlinCorr
{
false
};
float
m_nonLinCorrRefADC
;
float
m_nonLinCorrRefScale
;
float
m_nonLinCorrRefADC
{
500
}
;
float
m_nonLinCorrRefScale
{
100
}
;
std
::
vector
<
float
>
m_nonLinCorrParamsHG
;
std
::
vector
<
float
>
m_nonLinCorrParamsLG
;
...
...
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