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 diff --git a/s3tools/s3tool.rb b/s3tools/s3tool.rb index 9ae3549b..640f8e98 100755 --- a/s3tools/s3tool.rb +++ b/s3tools/s3tool.rb @@ -8,7 +8,7 @@ require 'fileutils' # default versions -VersionLatest = 'epic.25.08.0' +VersionLatest = 'epic.25.10.0' VersionPrevious = 'epic.25.03.1' # default CLI options @@ -52,7 +52,29 @@ 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| + "beagle:eHe3.#{options.energy}_q2_#{minQ2}_#{maxQ2>0 ? maxQ2 : 100000}" + }, + :releaseSubDir => Proc.new { + "/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}" }, + }, + 'epic.25.10.0' => { + :comment => 'Pythia 8: high-stats October 2025 production', + :crossSectionID => Proc.new { |minQ2,maxQ2| + "pythia8:#{options.energy}/minQ2=#{minQ2}" + }, + :releaseSubDir => Proc.new { + "/volatile/eic/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/NC" + }, + :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 +523,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',