Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hcana
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
Container Registry
Model registry
Operate
Environments
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
jlab
hallc
analyzer_software
hcana
Commits
11731902
Commit
11731902
authored
7 years ago
by
Mark Jones
Committed by
Mark K Jones
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Modify THcTrigDet.cxx and h to have ADC reference time subtracted fAdcPulseTime
parent
de787b3e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/THcTrigDet.cxx
+17
-3
17 additions, 3 deletions
src/THcTrigDet.cxx
src/THcTrigDet.h
+1
-0
1 addition, 0 deletions
src/THcTrigDet.h
with
18 additions
and
3 deletions
src/THcTrigDet.cxx
+
17
−
3
View file @
11731902
...
@@ -127,7 +127,7 @@ THcTrigDet::THcTrigDet(
...
@@ -127,7 +127,7 @@ THcTrigDet::THcTrigDet(
fNumAdc
(
0
),
fNumTdc
(
0
),
fAdcNames
(),
fTdcNames
(),
fNumAdc
(
0
),
fNumTdc
(
0
),
fAdcNames
(),
fTdcNames
(),
fTdcTimeRaw
(),
fTdcTime
(),
fTdcTimeRaw
(),
fTdcTime
(),
fAdcPedRaw
(),
fAdcPulseIntRaw
(),
fAdcPulseAmpRaw
(),
fAdcPulseTimeRaw
(),
fAdcPedRaw
(),
fAdcPulseIntRaw
(),
fAdcPulseAmpRaw
(),
fAdcPulseTimeRaw
(),
fAdcPed
(),
fAdcPulseInt
(),
fAdcPulseAmp
(),
fAdcPed
(),
fAdcPulseInt
(),
fAdcPulseAmp
(),
fAdcPulseTime
(),
fTdcMultiplicity
(),
fAdcMultiplicity
()
fTdcMultiplicity
(),
fAdcMultiplicity
()
{}
{}
...
@@ -145,6 +145,7 @@ THaAnalysisObject::EStatus THcTrigDet::Init(const TDatime& date) {
...
@@ -145,6 +145,7 @@ THaAnalysisObject::EStatus THcTrigDet::Init(const TDatime& date) {
fAdcPulseIntRaw
[
i
]
=
0
;
fAdcPulseIntRaw
[
i
]
=
0
;
fAdcPulseAmpRaw
[
i
]
=
0
;
fAdcPulseAmpRaw
[
i
]
=
0
;
fAdcPulseTimeRaw
[
i
]
=
0
;
fAdcPulseTimeRaw
[
i
]
=
0
;
fAdcPulseTime
[
i
]
=
kBig
;
fAdcPed
[
i
]
=
0.0
;
fAdcPed
[
i
]
=
0.0
;
fAdcPulseInt
[
i
]
=
0.0
;
fAdcPulseInt
[
i
]
=
0.0
;
fAdcPulseAmp
[
i
]
=
0.0
;
fAdcPulseAmp
[
i
]
=
0.0
;
...
@@ -191,6 +192,7 @@ void THcTrigDet::Clear(Option_t* opt) {
...
@@ -191,6 +192,7 @@ void THcTrigDet::Clear(Option_t* opt) {
fAdcPulseIntRaw
[
i
]
=
0
;
fAdcPulseIntRaw
[
i
]
=
0
;
fAdcPulseAmpRaw
[
i
]
=
0
;
fAdcPulseAmpRaw
[
i
]
=
0
;
fAdcPulseTimeRaw
[
i
]
=
0
;
fAdcPulseTimeRaw
[
i
]
=
0
;
fAdcPulseTime
[
i
]
=
kBig
;
fAdcPed
[
i
]
=
0.0
;
fAdcPed
[
i
]
=
0.0
;
fAdcPulseInt
[
i
]
=
0.0
;
fAdcPulseInt
[
i
]
=
0.0
;
fAdcPulseAmp
[
i
]
=
0.0
;
fAdcPulseAmp
[
i
]
=
0.0
;
...
@@ -221,6 +223,7 @@ Int_t THcTrigDet::Decode(const THaEvData& evData) {
...
@@ -221,6 +223,7 @@ Int_t THcTrigDet::Decode(const THaEvData& evData) {
fAdcPulseIntRaw
[
cnt
]
=
rawAdcHit
.
GetPulseIntRaw
();
fAdcPulseIntRaw
[
cnt
]
=
rawAdcHit
.
GetPulseIntRaw
();
fAdcPulseAmpRaw
[
cnt
]
=
rawAdcHit
.
GetPulseAmpRaw
();
fAdcPulseAmpRaw
[
cnt
]
=
rawAdcHit
.
GetPulseAmpRaw
();
fAdcPulseTimeRaw
[
cnt
]
=
rawAdcHit
.
GetPulseTimeRaw
();
fAdcPulseTimeRaw
[
cnt
]
=
rawAdcHit
.
GetPulseTimeRaw
();
fAdcPulseTime
[
cnt
]
=
rawAdcHit
.
GetPulseTime
();
fAdcPed
[
cnt
]
=
rawAdcHit
.
GetPed
();
fAdcPed
[
cnt
]
=
rawAdcHit
.
GetPed
();
fAdcPulseInt
[
cnt
]
=
rawAdcHit
.
GetPulseInt
();
fAdcPulseInt
[
cnt
]
=
rawAdcHit
.
GetPulseInt
();
...
@@ -292,6 +295,7 @@ Int_t THcTrigDet::DefineVariables(THaAnalysisObject::EMode mode) {
...
@@ -292,6 +295,7 @@ Int_t THcTrigDet::DefineVariables(THaAnalysisObject::EMode mode) {
std
::
vector
<
TString
>
adcPulseIntRawTitle
(
fNumAdc
),
adcPulseIntRawVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPulseIntRawTitle
(
fNumAdc
),
adcPulseIntRawVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPulseAmpRawTitle
(
fNumAdc
),
adcPulseAmpRawVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPulseAmpRawTitle
(
fNumAdc
),
adcPulseAmpRawVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPulseTimeRawTitle
(
fNumAdc
),
adcPulseTimeRawVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPulseTimeRawTitle
(
fNumAdc
),
adcPulseTimeRawVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPulseTimeTitle
(
fNumAdc
),
adcPulseTimeVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPedTitle
(
fNumAdc
),
adcPedVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPedTitle
(
fNumAdc
),
adcPedVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPulseIntTitle
(
fNumAdc
),
adcPulseIntVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPulseIntTitle
(
fNumAdc
),
adcPulseIntVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPulseAmpTitle
(
fNumAdc
),
adcPulseAmpVar
(
fNumAdc
);
std
::
vector
<
TString
>
adcPulseAmpTitle
(
fNumAdc
),
adcPulseAmpVar
(
fNumAdc
);
...
@@ -369,8 +373,18 @@ Int_t THcTrigDet::DefineVariables(THaAnalysisObject::EMode mode) {
...
@@ -369,8 +373,18 @@ Int_t THcTrigDet::DefineVariables(THaAnalysisObject::EMode mode) {
adcMultiplicityVar
.
at
(
i
).
Data
()
adcMultiplicityVar
.
at
(
i
).
Data
()
};
};
vars
.
push_back
(
entry8
);
vars
.
push_back
(
entry8
);
}
adcPulseTimeTitle
.
at
(
i
)
=
fAdcNames
.
at
(
i
)
+
"_adcPulseTime"
;
adcPulseTimeVar
.
at
(
i
)
=
TString
::
Format
(
"fAdcPulseTime[%d]"
,
i
);
RVarDef
entry9
{
adcPulseTimeTitle
.
at
(
i
).
Data
(),
adcPulseTimeTitle
.
at
(
i
).
Data
(),
adcPulseTimeVar
.
at
(
i
).
Data
()
};
vars
.
push_back
(
entry9
);
}
// loop over fNumAdc
// Push the variable names for TDC channels.
// Push the variable names for TDC channels.
std
::
vector
<
TString
>
tdcTimeRawTitle
(
fNumTdc
),
tdcTimeRawVar
(
fNumTdc
);
std
::
vector
<
TString
>
tdcTimeRawTitle
(
fNumTdc
),
tdcTimeRawVar
(
fNumTdc
);
std
::
vector
<
TString
>
tdcTimeTitle
(
fNumTdc
),
tdcTimeVar
(
fNumTdc
);
std
::
vector
<
TString
>
tdcTimeTitle
(
fNumTdc
),
tdcTimeVar
(
fNumTdc
);
...
...
This diff is collapsed.
Click to expand it.
src/THcTrigDet.h
+
1
−
0
View file @
11731902
...
@@ -56,6 +56,7 @@ class THcTrigDet : public THaDetector, public THcHitList {
...
@@ -56,6 +56,7 @@ class THcTrigDet : public THaDetector, public THcHitList {
Double_t
fAdcPed
[
fMaxAdcChannels
];
Double_t
fAdcPed
[
fMaxAdcChannels
];
Double_t
fAdcPulseInt
[
fMaxAdcChannels
];
Double_t
fAdcPulseInt
[
fMaxAdcChannels
];
Double_t
fAdcPulseAmp
[
fMaxAdcChannels
];
Double_t
fAdcPulseAmp
[
fMaxAdcChannels
];
Double_t
fAdcPulseTime
[
fMaxAdcChannels
];
Int_t
fTdcMultiplicity
[
fMaxTdcChannels
];
Int_t
fTdcMultiplicity
[
fMaxTdcChannels
];
Int_t
fAdcMultiplicity
[
fMaxAdcChannels
];
Int_t
fAdcMultiplicity
[
fMaxAdcChannels
];
...
...
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