Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
JZCaPA
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
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
Riccardo Longo
JZCaPA
Commits
3b92d82e
Commit
3b92d82e
authored
3 years ago
by
Chad Lantz
Browse files
Options
Downloads
Patches
Plain Diff
Moved call to Detector::PrintMap() to DataReader2021 for uniformity.
parent
ba0719e8
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Analysis/src/DataReader2021.cpp
+5
-4
5 additions, 4 deletions
Analysis/src/DataReader2021.cpp
Analysis/src/EM.cpp
+3
-2
3 additions, 2 deletions
Analysis/src/EM.cpp
Analysis/src/RPD.cpp
+3
-2
3 additions, 2 deletions
Analysis/src/RPD.cpp
with
11 additions
and
8 deletions
Analysis/src/DataReader2021.cpp
+
5
−
4
View file @
3b92d82e
...
...
@@ -252,6 +252,7 @@ void DataReader2021::LoadConfigurationFile(std::string _inFile ){
m_detectors
.
erase
(
m_detectors
.
begin
()
+
det
);
}
else
{
names
+=
m_detectors
.
at
(
det
)
->
GetName
()
+
"; "
;
m_detectors
.
at
(
det
)
->
PrintMap
();
}
}
std
::
cout
<<
"Detectors found in config file: "
<<
names
<<
std
::
endl
<<
std
::
endl
;
...
...
@@ -545,10 +546,10 @@ void DataReader2021::Initialize(){
// If no output directory is specified by the user
// one is created for this run in $JZCaPA/results. Default is $JZCaPA/results/
// If an output tag has been chosen, use it to name the directory. Default is "run"
std
::
string
o
utDir
=
(
m_outputDir
!=
""
)
?
m_outputDir
:
(
std
::
string
)
std
::
getenv
(
"JZCaPA"
)
+
"/results"
;
std
::
string
dirName
=
(
m_outputTag
==
""
)
?
"run"
:
m_outputTag
;
m_outputDir
+=
Form
(
"/%s%d/"
,
dirName
.
c_str
(),
m_runNumber
);
gSystem
->
Exec
(
(
"mkdir -p
"
+
m_outputDir
)
.
c_str
()
);
m_outp
utDir
=
(
m_outputDir
!=
""
)
?
m_outputDir
:
(
std
::
string
)
std
::
getenv
(
"JZCaPA"
)
+
"/results"
;
m_outputTag
=
(
m_outputTag
==
""
)
?
"run"
:
m_outputTag
;
m_outputDir
+=
Form
(
"/%s%d/"
,
m_outputTag
.
c_str
(),
m_runNumber
);
gSystem
->
Exec
(
Form
(
"mkdir -p
%s"
,
m_outputDir
.
c_str
()
)
);
// If we are reading a list of files, or have no run number
// make default name output.root, otherwise make it
...
...
This diff is collapsed.
Click to expand it.
Analysis/src/EM.cpp
+
3
−
2
View file @
3b92d82e
...
...
@@ -83,8 +83,9 @@ void EM::LoadElements( std::vector < Channel* > _elements, int _runNumber ){
}
}
std
::
cout
<<
"EM object created with "
<<
m_nRows
<<
" rows and "
<<
m_nColumns
<<
" columns"
<<
std
::
endl
;
PrintMap
();
if
(
GetChannelsVector
().
size
()
>
0
)
std
::
cout
<<
"EM object created with "
<<
m_nRows
<<
" rows and "
<<
m_nColumns
<<
" columns"
<<
std
::
endl
;
}
/** @brief Get the properties of a detector element
...
...
This diff is collapsed.
Click to expand it.
Analysis/src/RPD.cpp
+
3
−
2
View file @
3b92d82e
...
...
@@ -77,8 +77,9 @@ RPD::RPD( std::vector < Channel* > _elements, int _runNumber, std::string _name
}
}
std
::
cout
<<
std
::
endl
<<
GetName
()
<<
" object created with "
<<
m_nRows
<<
" rows and "
<<
m_nColumns
<<
" columns"
<<
std
::
endl
;
PrintMap
();
if
(
GetChannelsVector
().
size
()
>
0
)
std
::
cout
<<
std
::
endl
<<
GetName
()
<<
" object created with "
<<
m_nRows
<<
" rows and "
<<
m_nColumns
<<
" columns"
<<
std
::
endl
;
}
/** @brief Constructor that takes the whole vector of channels readout and selects and stores only the RPD ones
* @param _elements Vector of Channels with all detector configs
...
...
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