From 1094097f78e590cb76c7bb8f777d293c1b55a8d9 Mon Sep 17 00:00:00 2001 From: Connor Pecar Date: Fri, 5 Dec 2025 09:52:59 -0500 Subject: [PATCH 1/4] Fix q2 range of the highest q2 generated with BeAGLE (could probably delete 100_1000 but need to check with Greg that this wouldn't break old campaigns) --- datarec/xsec/xsec.dat | 1 + 1 file changed, 1 insertion(+) diff --git a/datarec/xsec/xsec.dat b/datarec/xsec/xsec.dat index 72d46475..4620df7f 100644 --- a/datarec/xsec/xsec.dat +++ b/datarec/xsec/xsec.dat @@ -71,4 +71,5 @@ pythia6:ep-18x275-Lambda 8.830e+05 0.0011 # FIXME: assuming genera beagle:eHe3.10x166_q2_1_10 2.0303e+05 0.001 # FIXME: assuming value beagle:eHe3.10x166_q2_10_100 4.29428e+04 0.001 # FIXME: assuming value beagle:eHe3.10x166_q2_100_1000 1.585e+03 0.001 # FIXME: assuming value +beagle:eHe3.10x166_q2_100_10000 1.585e+03 0.001 # FIXME: assuming value From 0f2387cc827364489619dbe99f902d7bf6143cdb Mon Sep 17 00:00:00 2001 From: Connor Pecar Date: Fri, 5 Dec 2025 09:55:12 -0500 Subject: [PATCH 2/4] Add 25.10.0 (pythia) and 25.10.2 (beagle) campaigns --- s3tools/s3tool.rb | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/s3tools/s3tool.rb b/s3tools/s3tool.rb index 9ae3549b..42a04178 100755 --- a/s3tools/s3tool.rb +++ b/s3tools/s3tool.rb @@ -8,7 +8,8 @@ require 'fileutils' # default versions -VersionLatest = 'epic.25.08.0' +#VersionLatest = 'epic.25.08.0' +VersionLatest = 'epic.25.10.0' VersionPrevious = 'epic.25.03.1' # default CLI options @@ -52,7 +53,46 @@ def ecceQ2range(minQ2,maxQ2) # return file path suffix, for ECCE Q2 ranges # :fileExtension => File extension (optional, defaults to 'root') # } prodSettings = { -'epic.25.08.0' => { + 'epic.25.10.2' => { + :comment => 'BeAGLE: high-stats October 2025 production', + :crossSectionID => Proc.new { |minQ2,maxQ2| + if options.target == 'He3' + "beagle:eHe3.#{options.energy}_q2_#{minQ2}_#{maxQ2>0 ? maxQ2 : 100000}" + # could presumably delete pythia8 for 25.10.2 + else + "pythia8:#{options.energy}/minQ2=#{minQ2}" + end + }, + :releaseSubDir => Proc.new { + if options.target == 'He3' + "/volatile/eic/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/BeAGLE1.03.02-1.0/eHe3" + else + "/volatile/eic/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/NC" + end + }, + :energySubDir => Proc.new { "#{options.energy}" }, + :dataSubDir => Proc.new { |minQ2| "minQ2=#{minQ2}" }, + }, + 'epic.25.10.0' => { + :comment => 'Pythia 8: high-stats October 2025 production', + :crossSectionID => Proc.new { |minQ2,maxQ2| + if options.target == 'He3' + "beagle:eHe3.#{options.energy}_q2_#{minQ2}_#{maxQ2>0 ? maxQ2 : 100000}" + else + "pythia8:#{options.energy}/minQ2=#{minQ2}" + end + }, + :releaseSubDir => Proc.new { + if options.target == 'He3' + "/volatile/eic/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/BeAGLE1.03.02-1.0/eHe3" + else + "/volatile/eic/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/NC" + end + }, + :energySubDir => Proc.new { "#{options.energy}" }, + :dataSubDir => Proc.new { |minQ2| "minQ2=#{minQ2}" }, + }, + 'epic.25.08.0' => { :comment => 'Pythia 8: high-stats August 2025 production', :crossSectionID => Proc.new { |minQ2,maxQ2| if options.target == 'He3' @@ -501,6 +541,8 @@ def mc_cp(srcfile,tgtdir) # pattern: "#{energy}/minQ2=#{minQ2}/" elsif [ + 'epic.25.10.2', + 'epic.25.10.0', 'epic.25.08.0', 'epic.25.03.1', 'epic.25.02.0', From 345f60eb45823f7689aad16382cfbdc35ef86396 Mon Sep 17 00:00:00 2001 From: Connor Pecar Date: Tue, 9 Dec 2025 13:18:28 -0500 Subject: [PATCH 3/4] Remove pythia8 for 25.10.2 and beagle for 25.10.0 --- s3tools/s3tool.rb | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/s3tools/s3tool.rb b/s3tools/s3tool.rb index 42a04178..122644fb 100755 --- a/s3tools/s3tool.rb +++ b/s3tools/s3tool.rb @@ -56,19 +56,10 @@ def ecceQ2range(minQ2,maxQ2) # return file path suffix, for ECCE Q2 ranges 'epic.25.10.2' => { :comment => 'BeAGLE: high-stats October 2025 production', :crossSectionID => Proc.new { |minQ2,maxQ2| - if options.target == 'He3' "beagle:eHe3.#{options.energy}_q2_#{minQ2}_#{maxQ2>0 ? maxQ2 : 100000}" - # could presumably delete pythia8 for 25.10.2 - else - "pythia8:#{options.energy}/minQ2=#{minQ2}" - end }, :releaseSubDir => Proc.new { - if options.target == 'He3' - "/volatile/eic/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/BeAGLE1.03.02-1.0/eHe3" - else - "/volatile/eic/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/NC" - end + "/volatile/eic/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/BeAGLE1.03.02-1.0/eHe3" }, :energySubDir => Proc.new { "#{options.energy}" }, :dataSubDir => Proc.new { |minQ2| "minQ2=#{minQ2}" }, @@ -76,18 +67,10 @@ def ecceQ2range(minQ2,maxQ2) # return file path suffix, for ECCE Q2 ranges 'epic.25.10.0' => { :comment => 'Pythia 8: high-stats October 2025 production', :crossSectionID => Proc.new { |minQ2,maxQ2| - if options.target == 'He3' - "beagle:eHe3.#{options.energy}_q2_#{minQ2}_#{maxQ2>0 ? maxQ2 : 100000}" - else "pythia8:#{options.energy}/minQ2=#{minQ2}" - end }, :releaseSubDir => Proc.new { - if options.target == 'He3' - "/volatile/eic/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/BeAGLE1.03.02-1.0/eHe3" - else "/volatile/eic/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/NC" - end }, :energySubDir => Proc.new { "#{options.energy}" }, :dataSubDir => Proc.new { |minQ2| "minQ2=#{minQ2}" }, From 4f8bb733ed355651bdcd9822b0891ad1c29a7bfa Mon Sep 17 00:00:00 2001 From: Connor Pecar Date: Thu, 11 Dec 2025 11:30:56 -0500 Subject: [PATCH 4/4] fix version latest --- s3tools/s3tool.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/s3tools/s3tool.rb b/s3tools/s3tool.rb index 122644fb..640f8e98 100755 --- a/s3tools/s3tool.rb +++ b/s3tools/s3tool.rb @@ -8,7 +8,6 @@ require 'fileutils' # default versions -#VersionLatest = 'epic.25.08.0' VersionLatest = 'epic.25.10.0' VersionPrevious = 'epic.25.03.1'