Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
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
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
Computing
cbmroot
Commits
a640e4e8
Commit
a640e4e8
authored
1 year ago
by
Michael Deveaux
Committed by
Florian Uhlig
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix code after rebase
parent
d8e22cee
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1371
Add time based digitization and reconstruction for MVD
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
+1
-1
1 addition, 1 deletion
.../detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
+4
-4
4 additions, 4 deletions
core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
with
5 additions
and
5 deletions
core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
+
1
−
1
View file @
a640e4e8
...
...
@@ -64,7 +64,7 @@ CbmMvdSensorDataSheet::CbmMvdSensorDataSheet()
}
// ----- Destructor ----------------------------------------------------
CbmMvdSensorDataSheet
::~
CbmMvdSensorDataSheet
()
{}
//
CbmMvdSensorDataSheet::~CbmMvdSensorDataSheet() {}
// -------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
+
4
−
4
View file @
a640e4e8
...
...
@@ -34,7 +34,7 @@ class CbmMvdSensorDataSheet : public TNamed {
public:
/** Default constructor **/
CbmMvdSensorDataSheet
()
=
default
;
CbmMvdSensorDataSheet
();
virtual
void
Print
(
Option_t
*
opt
=
""
)
const
;
std
::
string
ToString
()
const
;
...
...
@@ -66,9 +66,9 @@ protected:
Double_t
fIntegrationTime
;
// Integration time of the pixels
Double_t
fEpiTh
;
// Thickness of the epitaxial layer
Double_t
fChargeThreshold
;
Double_t
fSignalRiseTime
;
Double_t
fSignalFallTime
;
//
Double_t fChargeThreshold;
//
Double_t fSignalRiseTime;
//
Double_t fSignalFallTime;
Double_t
fShaperNormalisationFactor
;
//>>>>>>> ddd5fbbb (Time response added)
...
...
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