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
83287b2a
Commit
83287b2a
authored
3 years ago
by
Alexandru Bercuci
Browse files
Options
Downloads
Patches
Plain Diff
remove dependecy on run number of the CbmTrdUnpackConfig
parent
85200e75
No related branches found
No related tags found
1 merge request
!532
Fix geometry of the TRD system in the mCBM 2021
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
macro/run/run_unpack_online.C
+1
-1
1 addition, 1 deletion
macro/run/run_unpack_online.C
macro/run/run_unpack_tsa.C
+2
-2
2 additions, 2 deletions
macro/run/run_unpack_tsa.C
with
3 additions
and
3 deletions
macro/run/run_unpack_online.C
+
1
−
1
View file @
83287b2a
...
@@ -100,7 +100,7 @@ void run_unpack_online(std::string publisher = "localhost", Int_t serverHttpPort
...
@@ -100,7 +100,7 @@ void run_unpack_online(std::string publisher = "localhost", Int_t serverHttpPort
// ---- TRD ----
// ---- TRD ----
TString
trdsetuptag
=
""
;
TString
trdsetuptag
=
""
;
cbmsetup
->
GetGeoTag
(
ECbmModuleId
::
kTrd
,
trdsetuptag
);
cbmsetup
->
GetGeoTag
(
ECbmModuleId
::
kTrd
,
trdsetuptag
);
auto
trdconfig
=
std
::
make_shared
<
CbmTrdUnpackConfig
>
(
trdsetuptag
.
Data
()
,
runid
);
auto
trdconfig
=
std
::
make_shared
<
CbmTrdUnpackConfig
>
(
trdsetuptag
.
Data
());
std
::
string
parfilesbasepath
=
Form
(
"%s/parameters/trd"
,
srcDir
.
Data
());
std
::
string
parfilesbasepath
=
Form
(
"%s/parameters/trd"
,
srcDir
.
Data
());
trdconfig
->
SetParFilesBasePath
(
parfilesbasepath
);
trdconfig
->
SetParFilesBasePath
(
parfilesbasepath
);
trdconfig
->
SetMonitor
(
GetTrdMonitor
(
outfilename
));
trdconfig
->
SetMonitor
(
GetTrdMonitor
(
outfilename
));
...
...
This diff is collapsed.
Click to expand it.
macro/run/run_unpack_tsa.C
+
2
−
2
View file @
83287b2a
...
@@ -139,7 +139,7 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
...
@@ -139,7 +139,7 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
TString
trdsetuptag
=
""
;
TString
trdsetuptag
=
""
;
cbmsetup
->
GetGeoTag
(
ECbmModuleId
::
kTrd
,
trdsetuptag
);
cbmsetup
->
GetGeoTag
(
ECbmModuleId
::
kTrd
,
trdsetuptag
);
// trd1Dconfig = std::make_shared<CbmTrdUnpackConfig>(trdsetuptag.Data(), runid);
// trd1Dconfig = std::make_shared<CbmTrdUnpackConfig>(trdsetuptag.Data(), runid);
trd1Dconfig
=
std
::
make_shared
<
CbmTrdUnpackConfig
>
(
trdsetuptag
.
Data
()
,
3
);
trd1Dconfig
=
std
::
make_shared
<
CbmTrdUnpackConfig
>
(
trdsetuptag
.
Data
());
if
(
trd1Dconfig
)
{
if
(
trd1Dconfig
)
{
trd1Dconfig
->
SetDoWriteOutput
();
trd1Dconfig
->
SetDoWriteOutput
();
// Activate the line below to write Trd1D digis to a separate "TrdSpadicDigi" branch. Can be used to separate between Fasp and Spadic digis
// Activate the line below to write Trd1D digis to a separate "TrdSpadicDigi" branch. Can be used to separate between Fasp and Spadic digis
...
@@ -159,7 +159,7 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
...
@@ -159,7 +159,7 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
// ---- TRDFASP2D ----
// ---- TRDFASP2D ----
std
::
shared_ptr
<
CbmTrdUnpackConfigFasp2D
>
trdfasp2dconfig
=
nullptr
;
std
::
shared_ptr
<
CbmTrdUnpackConfigFasp2D
>
trdfasp2dconfig
=
nullptr
;
trdfasp2dconfig
=
std
::
make_shared
<
CbmTrdUnpackConfigFasp2D
>
(
trdsetuptag
.
Data
()
,
3
);
trdfasp2dconfig
=
std
::
make_shared
<
CbmTrdUnpackConfigFasp2D
>
(
trdsetuptag
.
Data
());
if
(
trdfasp2dconfig
)
{
if
(
trdfasp2dconfig
)
{
// trdfasp2dconfig->SetDebugState();
// trdfasp2dconfig->SetDebugState();
trdfasp2dconfig
->
SetDoWriteOutput
();
trdfasp2dconfig
->
SetDoWriteOutput
();
...
...
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