From bfd2656a326372920503ebfa34177aa9d6ba699d Mon Sep 17 00:00:00 2001 From: xyu3 Date: Fri, 7 Aug 2026 05:58:37 -0400 Subject: [PATCH 1/2] delete CaloGemMapping & fix KFP var name --- Physics_Val_TF/data/macro/Fun4All_HF.C | 6 ------ Physics_Val_TF/data/macro/HF_selections.C | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Physics_Val_TF/data/macro/Fun4All_HF.C b/Physics_Val_TF/data/macro/Fun4All_HF.C index a8669fb..af5373f 100644 --- a/Physics_Val_TF/data/macro/Fun4All_HF.C +++ b/Physics_Val_TF/data/macro/Fun4All_HF.C @@ -37,7 +37,6 @@ #include #include -#include #include #include @@ -470,11 +469,6 @@ void Fun4All_HF(const int nEvents = 500, } se->registerSubsystem(projection); - CaloGeomMapping *cgm = new CaloGeomMapping(); - cgm->set_detector_name("CEMC"); - cgm->set_UseDetailedGeometry(true); - se->registerSubsystem(cgm); - ////////////////// // Clusters std::cout << "Building clusters" << std::endl; diff --git a/Physics_Val_TF/data/macro/HF_selections.C b/Physics_Val_TF/data/macro/HF_selections.C index 56d81cc..470e669 100644 --- a/Physics_Val_TF/data/macro/HF_selections.C +++ b/Physics_Val_TF/data/macro/HF_selections.C @@ -79,7 +79,7 @@ namespace HeavyFlavorReco //Used float lf_cuts_setMinDIRA{0.99}; float lf_cuts_setDecayLengthRange_min{0.05}; - float lf_cuts_setMinimumTrackIP_XY{0.05}; + float lf_cuts_setMinimumTrackPV_DCA_XY{0.05}; float lf_cuts_setMinMVTXhits{1}; float lf_cuts_setMinINTThits{1}; float lf_cuts_setMinTPChits{20}; @@ -87,7 +87,7 @@ namespace HeavyFlavorReco float lf_cuts_setMaximumDaughterDCA{0.5}; //Unused - float lf_cuts_setMotherIPchi2{FLT_MAX}; + float lf_cuts_setMotherPV_DCA_StdDev{FLT_MAX}; float lf_cuts_setFlightDistancechi2{-1.}; float lf_cuts_setMinDIRA_XY{-1.1}; float lf_cuts_setDecayLengthRange_max{FLT_MAX}; @@ -101,9 +101,9 @@ namespace HeavyFlavorReco float lf_cuts_setMinDecayLengthSignificance{-1e5}; float lf_cuts_setMinDecayLengthSignificance_XY{-1e5}; float lf_cuts_setMinimumTrackPT{0.0}; - float lf_cuts_setMinimumTrackIPchi2{-1.}; - float lf_cuts_setMinimumTrackIPchi2_XY{-1.}; - float lf_cuts_setMinimumTrackIP{-1.}; + float lf_cuts_setMinimumTrackPV_DCA{-1.}; + float lf_cuts_setMinimumTrackPV_DCA_StdDev{-1.}; + float lf_cuts_setMinimumTrackPV_DCA_StdDev_XY{-1.}; float lf_cuts_setMaximumTrackchi2nDOF{300.}; float lf_cuts_setMaximumDaughterDCA_XY{1}; float lf_cuts_setMotherPT{0}; From 818324601f1b4ff9c0d52b1ad8da4e5e265c130f Mon Sep 17 00:00:00 2001 From: xyu3 Date: Fri, 7 Aug 2026 11:19:03 -0400 Subject: [PATCH 2/2] some fix --- Physics_Val_TF/data/getFiles.sh | 4 ++-- Physics_Val_TF/data/macro/runHFreco.sh | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Physics_Val_TF/data/getFiles.sh b/Physics_Val_TF/data/getFiles.sh index f14fe5b..fe5df7a 100755 --- a/Physics_Val_TF/data/getFiles.sh +++ b/Physics_Val_TF/data/getFiles.sh @@ -70,8 +70,8 @@ do do startEvent=$(($i*$nEvents)) - echo "${nEvents} ${DST} ${directory} ${startEvent}" >> ${outFile} - #echo "${nEvents} ${DST} ${startEvent}" >> ${outFile} + #echo "${nEvents} ${DST} ${directory} ${startEvent}" >> ${outFile} + echo "${nEvents} ${DST} ${startEvent}" >> ${outFile} done diff --git a/Physics_Val_TF/data/macro/runHFreco.sh b/Physics_Val_TF/data/macro/runHFreco.sh index b601290..80496a8 100755 --- a/Physics_Val_TF/data/macro/runHFreco.sh +++ b/Physics_Val_TF/data/macro/runHFreco.sh @@ -7,17 +7,17 @@ export LOGNAME=${USER} export HOME=/sphenix/u/${LOGNAME} # uncomment for local development -export SPHENIX=${HOME}/sPHENIX -export MYINSTALL=$SPHENIX/install -export LD_LIBRARY_PATH=$MYINSTALL/lib:$LD_LIBRARY_PATH -export ROOT_INCLUDE_PATH=$MYINSTALL/include:$ROOT_INCLUDE_PATH -export PATH="$HOME/.local/bin:$PATH" +#export SPHENIX=${HOME}/sPHENIX +#export MYINSTALL=$SPHENIX/install +#export LD_LIBRARY_PATH=$MYINSTALL/lib:$LD_LIBRARY_PATH +#export ROOT_INCLUDE_PATH=$MYINSTALL/include:$ROOT_INCLUDE_PATH +#export PATH="$HOME/.local/bin:$PATH" -source /opt/sphenix/core/bin/setup_local.sh $MYINSTALL +#source /opt/sphenix/core/bin/setup_local.sh $MYINSTALL useScratch=false -if ${useScratch}=true; then +if [[ "${useScratch}" == true ]]; then this_script=$BASH_SOURCE this_script=`readlink -f $this_script` this_dir=`dirname $this_script` @@ -36,10 +36,10 @@ fi nEvents=$1 inDst=$2 -inDir=$3 +outDir=$3 nSkip=$4 -if ${useScratch}=true; then +if [[ "${useScratch}" == true ]]; then if [[ "${inDst}" == *.root ]]; then getinputfiles.pl $inDst elif [[ "${inDst}" == *.list ]]; then @@ -51,5 +51,5 @@ fi #printenv echo running: runHFreco.sh $* -root.exe -q -b Fun4All_HF.C\(${nEvents},\"${inDst}\",\"${inDir}\",${nSkip}\) +root.exe -q -b Fun4All_HF.C\(${nEvents},\"${inDst}\",\"${outDir}\",${nSkip}\) echo Script done