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
574a4dd3
"MQ/mcbm/CbmDeviceUnpack.h" did not exist on "848c96614c5eb0d9e9901cd1dc57efcd5ed680fa"
Commit
574a4dd3
authored
1 month ago
by
Sergei Zharko
Browse files
Options
Downloads
Patches
Plain Diff
beamtime2025-offline: switched reference detector to TOF in event-builder; parameter hash bump
parent
d75b7b39
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
external/InstallParameter.cmake
+1
-1
1 addition, 1 deletion
external/InstallParameter.cmake
macro/beamtime/common/reco_mcbm.sh
+4
-2
4 additions, 2 deletions
macro/beamtime/common/reco_mcbm.sh
macro/beamtime/mcbm2025/mcbm_event_reco_L1.C
+16
-14
16 additions, 14 deletions
macro/beamtime/mcbm2025/mcbm_event_reco_L1.C
with
21 additions
and
17 deletions
external/InstallParameter.cmake
+
1
−
1
View file @
574a4dd3
set
(
PARAMETER_VERSION
55e112210ffe331d54f20be44ae84f776f5707a9
)
# 2025/02/
16
set
(
PARAMETER_VERSION
8c8540d957031516d149f86eb6ed1008ab67ebee
)
# 2025/02/
24
set
(
PARAMETER_SRC_URL
"https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git"
)
set
(
PARAMETER_SRC_URL
"https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git"
)
download_project_if_needed
(
PROJECT Parameter_source
download_project_if_needed
(
PROJECT Parameter_source
...
...
This diff is collapsed.
Click to expand it.
macro/beamtime/common/reco_mcbm.sh
+
4
−
2
View file @
574a4dd3
...
@@ -374,9 +374,11 @@ SETUP_NAME=$(${RUN_INFO} --run ${RUN} --geotag)
...
@@ -374,9 +374,11 @@ SETUP_NAME=$(${RUN_INFO} --run ${RUN} --geotag)
#
#
if
[[
${
RUN
}
-ge
2350
&&
${
RUN
}
-le
2610
]]
;
then
if
[[
${
RUN
}
-ge
2350
&&
${
RUN
}
-le
2610
]]
;
then
MACRO_RECO
=
"
${
VMCWORKDIR
}
/macro/beamtime/mcbm2022/mcbm_event_reco_L1.C"
MACRO_RECO
=
"
${
VMCWORKDIR
}
/macro/beamtime/mcbm2022/mcbm_event_reco_L1.C"
elif
[[
${
RUN
}
-ge
2724
]]
;
then
elif
[[
${
RUN
}
-ge
2724
&&
${
RUN
}
-le
3199
]]
;
then
MACRO_RECO
=
"
${
VMCWORKDIR
}
/macro/beamtime/mcbm2024/mcbm_event_reco_L1.C"
MACRO_RECO
=
"
${
VMCWORKDIR
}
/macro/beamtime/mcbm2024/mcbm_event_reco_L1.C"
else
elif
[[
${
RUN
}
-ge
3400
]]
;
then
MACRO_RECO
=
"
${
VMCWORKDIR
}
/macro/beamtime/mcbm2025/mcbm_event_reco_L1.C"
else
printf
"E- Run %5d is undefined. Exiting"
"
${
RUN
}
"
printf
"E- Run %5d is undefined. Exiting"
"
${
RUN
}
"
exit
4
exit
4
fi
fi
...
...
This diff is collapsed.
Click to expand it.
macro/beamtime/mcbm2025/mcbm_event_reco_L1.C
+
16
−
14
View file @
574a4dd3
...
@@ -280,20 +280,20 @@ Bool_t mcbm_event_reco_L1(UInt_t uRunId = 3453,
...
@@ -280,20 +280,20 @@ Bool_t mcbm_event_reco_L1(UInt_t uRunId = 3453,
const
Int_t
eb_TriggerMinNumberTofLayers
{
4
};
const
Int_t
eb_TriggerMinNumberTofLayers
{
4
};
const
Int_t
eb_TriggerMinNumberRich
{
0
};
const
Int_t
eb_TriggerMinNumberRich
{
0
};
const
Int_t
eb_TrigWinMinBmon
{
-
5
0
};
const
Int_t
eb_TrigWinMinBmon
{
-
6
5
};
const
Int_t
eb_TrigWinMaxBmon
{
5
0
};
const
Int_t
eb_TrigWinMaxBmon
{
6
5
};
const
Int_t
eb_TrigWinMinSts
{
-
60
};
const
Int_t
eb_TrigWinMinSts
{
-
75
};
const
Int_t
eb_TrigWinMaxSts
{
60
};
const
Int_t
eb_TrigWinMaxSts
{
75
};
const
Int_t
eb_TrigWinMinMuch
{
-
10
0
};
const
Int_t
eb_TrigWinMinMuch
{
-
5
0
};
const
Int_t
eb_TrigWinMaxMuch
{
1
00
};
const
Int_t
eb_TrigWinMaxMuch
{
5
00
};
const
Int_t
eb_TrigWinMinTrd1d
{
-
3
00
};
const
Int_t
eb_TrigWinMinTrd1d
{
-
1
00
};
const
Int_t
eb_TrigWinMaxTrd1d
{
300
};
const
Int_t
eb_TrigWinMaxTrd1d
{
300
};
const
Int_t
eb_TrigWinMinTrd2d
{
-
2
00
};
const
Int_t
eb_TrigWinMinTrd2d
{
-
1
00
};
const
Int_t
eb_TrigWinMaxTrd2d
{
20
0
};
const
Int_t
eb_TrigWinMaxTrd2d
{
35
0
};
const
Int_t
eb_TrigWinMinTof
{
-
2
0
};
const
Int_t
eb_TrigWinMinTof
{
-
1
0
};
const
Int_t
eb_TrigWinMaxTof
{
6
0
};
const
Int_t
eb_TrigWinMaxTof
{
7
0
};
const
Int_t
eb_TrigWinMinRich
{
-
6
0
};
const
Int_t
eb_TrigWinMinRich
{
-
2
0
};
const
Int_t
eb_TrigWinMaxRich
{
6
0
};
const
Int_t
eb_TrigWinMaxRich
{
12
0
};
if
(
bEvB
)
{
if
(
bEvB
)
{
CbmTaskBuildRawEvents
*
evBuildRaw
=
new
CbmTaskBuildRawEvents
();
CbmTaskBuildRawEvents
*
evBuildRaw
=
new
CbmTaskBuildRawEvents
();
...
@@ -315,9 +315,11 @@ Bool_t mcbm_event_reco_L1(UInt_t uRunId = 3453,
...
@@ -315,9 +315,11 @@ Bool_t mcbm_event_reco_L1(UInt_t uRunId = 3453,
// Set Bmon as reference detector.
// Set Bmon as reference detector.
// Select only Bmon1 [newly installed for mcbm2024 data] (AB)
// Select only Bmon1 [newly installed for mcbm2024 data] (AB)
evBuildRaw
->
SetReferenceDetector
(
kRawEventBuilderDetBmon
,
{
0
,
1
});
//
evBuildRaw->SetReferenceDetector(kRawEventBuilderDetBmon, {0, 1});
// For making MuCh as seed detector
// For making MuCh as seed detector
// evBuildRaw->SetReferenceDetector(kRawEventBuilderDetMuch);
// evBuildRaw->SetReferenceDetector(kRawEventBuilderDetMuch);
evBuildRaw
->
SetReferenceDetector
(
kRawEventBuilderDetTof
);
// Use sliding window seed builder with STS
// Use sliding window seed builder with STS
//evBuildRaw->SetReferenceDetector(kRawEventBuilderDetUndef);
//evBuildRaw->SetReferenceDetector(kRawEventBuilderDetUndef);
...
...
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