Skip to content

Commit

Permalink
Freeze
Browse files Browse the repository at this point in the history
  • Loading branch information
fisyak committed Dec 30, 2024
1 parent fbedb61 commit c6716a3
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 5 deletions.
6 changes: 3 additions & 3 deletions bin/BuildAll.csh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ foreach root (root6 root5)
breaksw
case "*bnl.gov":
# set list = "gcc482 gcc492 gcc/6.3 gcc/10";
# set list = "gcc" # gcc/6.3 gcc/10.1.0"
set list = "gcc gcc/11 gcc/12"# gcc/13" # gcc/6.3 gcc/11"
set list = "gcc" # gcc/6.3 gcc/10.1.0"
# set list = "gcc gcc/11 gcc/12"# gcc/13" # gcc/6.3 gcc/11"
breaksw
endsw
set gcc_list = "${list}"
Expand All @@ -24,7 +24,7 @@ foreach root (root6 root5)
# if ($gcc == "gcc8" || gcc == "gcc631") set opts = "debug opt opt3"
foreach optt ($opts)
set bits = "64b";
if ($gcc == "gcc" && $root == "root5") set bits = "32b 64b";
# if ($gcc == "gcc" && $root == "root5") set bits = "32b 64b";
# echo "gcc = $gcc, optt = $optt, bits = $bits"
foreach bit (${bits})
unsetenv NODEBUG
Expand Down
1 change: 1 addition & 0 deletions bin/PicoDef.pm
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
# production_44p5GeV_fixedTarget_2021/ReversedFullField/P24iy_calib
# production_70GeV_fixedTarget_2021/ReversedFullField/P24iy_calib
# production_100GeV_fixedTarget_2021/ReversedFullField/P24iy_calib
# dir -ltrd /star/data*/reco/production*/*/P24iy | awk -F/ '{print $5"/"$6"/"$7}' | sort -u


@PicoDefs= (
Expand Down
2 changes: 1 addition & 1 deletion bin/setupROOTcmake.csh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ rm -f CMakeCache.txt
#-Dbuiltin_cfitsio=On -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always -msse -msse2 -msse3 -msse4.1 -mssse3" \
#-DCMAKE_C_FLAGS="-fdiagnostics-color=always -msse -msse2 -msse3 -msse4.1 -mssse3" \
# cmake --build . -- install -j8
if ($?CMAKE_PREFIX_PATH) setenv EXTRA_OFF "${EXTRA_OFF} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
if ($?CMAKE_PREFIX_PATH) setenv EXTRA_OFF "${EXTRA_OFF} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DZSTD_INCLUDE_DIR=${CMAKE_PREFIX_PATH}/include -DZSTD_LIBRARIES=${CMAKE_PREFIX_PATH}/lib"
echo "EXTRA_OFF = ${EXTRA_OFF}, CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}, CMAKE_C_FLAGS = ${CMAKE_C_FLAGS}"
cmake ${ROOT}/${ROOT_LEVEL}/root -DCMAKE_INSTALL_PREFIX=${ROOTSYS} -DCMAKE_BUILD_TYPE="${ROOT_BUILD}" \
-DCMAKE_C_COMPILER="${CC}" -DCMAKE_CXX_COMPILER="${CXX}" -DCMAKE_Fortran_COMPILER="${FC}" -Dfortran=ON \
Expand Down
17 changes: 17 additions & 0 deletions daily.RCF
Original file line number Diff line number Diff line change
Expand Up @@ -3370,6 +3370,8 @@ source /afs/rhic.bnl.gov/rhstar/group/.starver SL24y;
#sigma(@61 npts) = 5.31% for F-9p8GeV_fixedTarget_2020 #mu = 0.29% for F-9p8GeV_fixedTarget_2020




--------------------------------------------------------------------------------


Expand Down Expand Up @@ -3482,3 +3484,18 @@ index 23b508da8d..5e53678cfb 100644



================================================================================
12/28/2024
sed '/CLIENTSCRIPT="foo"/a CLIENTSCRIPT2="hello"' file

sed '/Priority = +10/a requirements = (Microarch >= "x86_64-v4")' sched08D32B88112F4DFB4F7A3A59C8984754_0_47.condor > condor.condor

touch q.condor
foreach f (`ls -1d sched*.condor`)
sed '/Priority = +10/a requirements = (Microarch >= "x86_64-v4")' ${f} | tee -a q.condor
end

foreach f (`ls -1d sched*.condor`)
set b = `echo ${f} | awk -F_ '{print $2"_"$3}'`
sed '/Priority = +10/a requirements = (Microarch >= "x86_64-v4")' ${f} > Q${b}
end
5 changes: 4 additions & 1 deletion xml/kfpAnalysis.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<job maxFilesPerProcess="25" filesPerHour="1.0" fileListSyntax="paths" simulateSubmission ="false" copyInputLocally="false">
<job maxFilesPerProcess="1" filesPerHour="1.0" fileListSyntax="paths" simulateSubmission ="true" copyInputLocally="false">
<command>
set CURRENT_DIR = `pwd`
#C cd ${SUBMITTINGDIRECTORY}
Expand Down Expand Up @@ -56,6 +56,9 @@ end
<Memory>
<MinMemory>3500</MinMemory>
</Memory>
<Requirements>
requirements = (Microarch >= "x86_64-v4")
</Requirements>
</ResourceUsage>
-->
<stdout URL="file:./sched$JOBID.log" />
Expand Down

0 comments on commit c6716a3

Please sign in to comment.