diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake index 9040b01cfb7f246f0ed3c09de18827704f0b26f7..2fd8559eead05307ae5bbff2d30e25b6e1f915d9 100644 --- a/external/InstallParameter.cmake +++ b/external/InstallParameter.cmake @@ -1,4 +1,4 @@ -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") download_project_if_needed(PROJECT Parameter_source diff --git a/macro/beamtime/common/reco_mcbm.sh b/macro/beamtime/common/reco_mcbm.sh index ac037f0591a8511ff1ab51ad137b41171fed8fb2..4844bdf88e3a232f444a15dffff214da0ab45418 100755 --- a/macro/beamtime/common/reco_mcbm.sh +++ b/macro/beamtime/common/reco_mcbm.sh @@ -374,9 +374,11 @@ SETUP_NAME=$(${RUN_INFO} --run ${RUN} --geotag) # if [[ ${RUN} -ge 2350 && ${RUN} -le 2610 ]]; then 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" -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}" exit 4 fi diff --git a/macro/beamtime/mcbm2025/mcbm_event_reco_L1.C b/macro/beamtime/mcbm2025/mcbm_event_reco_L1.C index ee0f42f363fb8a34cc9a78275877d580be89d7d9..4e1143a875759e924df157bc370118e26ff6acfc 100644 --- a/macro/beamtime/mcbm2025/mcbm_event_reco_L1.C +++ b/macro/beamtime/mcbm2025/mcbm_event_reco_L1.C @@ -280,20 +280,20 @@ Bool_t mcbm_event_reco_L1(UInt_t uRunId = 3453, const Int_t eb_TriggerMinNumberTofLayers{4}; const Int_t eb_TriggerMinNumberRich{0}; - const Int_t eb_TrigWinMinBmon{-50}; - const Int_t eb_TrigWinMaxBmon{50}; - const Int_t eb_TrigWinMinSts{-60}; - const Int_t eb_TrigWinMaxSts{60}; - const Int_t eb_TrigWinMinMuch{-100}; - const Int_t eb_TrigWinMaxMuch{100}; - const Int_t eb_TrigWinMinTrd1d{-300}; + const Int_t eb_TrigWinMinBmon{-65}; + const Int_t eb_TrigWinMaxBmon{65}; + const Int_t eb_TrigWinMinSts{-75}; + const Int_t eb_TrigWinMaxSts{75}; + const Int_t eb_TrigWinMinMuch{-50}; + const Int_t eb_TrigWinMaxMuch{500}; + const Int_t eb_TrigWinMinTrd1d{-100}; const Int_t eb_TrigWinMaxTrd1d{300}; - const Int_t eb_TrigWinMinTrd2d{-200}; - const Int_t eb_TrigWinMaxTrd2d{200}; - const Int_t eb_TrigWinMinTof{-20}; - const Int_t eb_TrigWinMaxTof{60}; - const Int_t eb_TrigWinMinRich{-60}; - const Int_t eb_TrigWinMaxRich{60}; + const Int_t eb_TrigWinMinTrd2d{-100}; + const Int_t eb_TrigWinMaxTrd2d{350}; + const Int_t eb_TrigWinMinTof{-10}; + const Int_t eb_TrigWinMaxTof{70}; + const Int_t eb_TrigWinMinRich{-20}; + const Int_t eb_TrigWinMaxRich{120}; if (bEvB) { CbmTaskBuildRawEvents* evBuildRaw = new CbmTaskBuildRawEvents(); @@ -315,9 +315,11 @@ Bool_t mcbm_event_reco_L1(UInt_t uRunId = 3453, // Set Bmon as reference detector. // 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 // evBuildRaw->SetReferenceDetector(kRawEventBuilderDetMuch); + evBuildRaw->SetReferenceDetector(kRawEventBuilderDetTof); + // Use sliding window seed builder with STS //evBuildRaw->SetReferenceDetector(kRawEventBuilderDetUndef);