From 5ca2d92ad6c674d7cacb38533e969f942ad01b0d Mon Sep 17 00:00:00 2001 From: cpecar Date: Wed, 12 Jul 2023 14:27:16 -0400 Subject: [PATCH 1/2] Updated s3tool to default to EPIC production 23.07.1 and brycecanyon configuration --- s3tools/s3tool.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/s3tools/s3tool.rb b/s3tools/s3tool.rb index 731b2223..eda02c72 100755 --- a/s3tools/s3tool.rb +++ b/s3tools/s3tool.rb @@ -8,8 +8,8 @@ require 'fileutils' # default versions -VersionLatest = 'epic.23.06.1' -VersionPrevious = 'epic.23.05.2' +VersionLatest = 'epic.23.07.1' +VersionPrevious = 'epic.23.06.1' # default CLI options options = OpenStruct.new @@ -19,7 +19,7 @@ options.mode = 's' options.limit = 2 options.configFile = '' -options.detector = 'arches' +options.detector = 'brycecanyon' options.radCor = false options.minQ2 = -1 options.maxQ2 = -1 @@ -50,6 +50,13 @@ def ecceQ2range(minQ2,maxQ2) # return file path suffix, for ECCE Q2 ranges # :fileExtension => File extension (optional, defaults to 'root') # } prodSettings = { + 'epic.23.07.1' => { + :comment => 'Pythia 8: high-stats July 2023 production', + :crossSectionID => Proc.new { |minQ2| "pythia8:#{options.energy}/minQ2=#{minQ2}" }, + :releaseSubDir => Proc.new { "S3/eictest/EPIC/RECO/#{versionNum(options.version)}/epic_#{options.detector}/DIS/NC" }, + :energySubDir => Proc.new { "#{options.energy}" }, + :dataSubDir => Proc.new { |minQ2| "minQ2=#{minQ2}" }, + }, 'epic.23.06.1' => { :comment => 'Pythia 8: high-stats June 2023 production', :crossSectionID => Proc.new { |minQ2| "pythia8:#{options.energy}/minQ2=#{minQ2}" }, @@ -388,6 +395,7 @@ def mc_cp(srcfile,tgtdir) # pattern: "#{energy}/minQ2=#{minQ2}/" elsif [ + 'epic.23.07.1', 'epic.23.06.1', 'epic.23.05.2', 'epic.23.05.1', From 2de36512654754af43ffb34acf44b99491ef12ac Mon Sep 17 00:00:00 2001 From: cpecar Date: Wed, 12 Jul 2023 14:33:20 -0400 Subject: [PATCH 2/2] ReconstructedChargedParticles -> ReconstructedParticles (includes information only from clusters) --- src/AnalysisEpic.cxx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/AnalysisEpic.cxx b/src/AnalysisEpic.cxx index 2a3af34c..7637f51f 100644 --- a/src/AnalysisEpic.cxx +++ b/src/AnalysisEpic.cxx @@ -44,25 +44,25 @@ void AnalysisEpic::Execute() TTreeReaderArray mcpart_psx(tr, "MCParticles.momentum.x"); TTreeReaderArray mcpart_psy(tr, "MCParticles.momentum.y"); TTreeReaderArray mcpart_psz(tr, "MCParticles.momentum.z"); - + // Reco tracks - TTreeReaderArray recparts_type(tr, "ReconstructedChargedParticles.type"); // needs to be made an int eventually in actual EE code - TTreeReaderArray recparts_e(tr, "ReconstructedChargedParticles.energy"); - TTreeReaderArray recparts_p_x(tr, "ReconstructedChargedParticles.momentum.x"); - TTreeReaderArray recparts_p_y(tr, "ReconstructedChargedParticles.momentum.y"); - TTreeReaderArray recparts_p_z(tr, "ReconstructedChargedParticles.momentum.z"); - TTreeReaderArray recparts_PDG(tr, "ReconstructedChargedParticles.PDG"); - TTreeReaderArray recparts_CHI2PID(tr, "ReconstructedChargedParticles.goodnessOfPID"); + TTreeReaderArray recparts_type(tr, "ReconstructedParticles.type"); // needs to be made an int eventually in actual EE code + TTreeReaderArray recparts_e(tr, "ReconstructedParticles.energy"); + TTreeReaderArray recparts_p_x(tr, "ReconstructedParticles.momentum.x"); + TTreeReaderArray recparts_p_y(tr, "ReconstructedParticles.momentum.y"); + TTreeReaderArray recparts_p_z(tr, "ReconstructedParticles.momentum.z"); + TTreeReaderArray recparts_PDG(tr, "ReconstructedParticles.PDG"); + TTreeReaderArray recparts_CHI2PID(tr, "ReconstructedParticles.goodnessOfPID"); // RecoAssociations - std::string assoc_branch_name = "ReconstructedChargedParticleAssociations"; + std::string assoc_branch_name = "ReconstructedParticleAssociations"; if(listOfBranches->FindObject(assoc_branch_name.c_str()) == nullptr) - assoc_branch_name = "ReconstructedChargedParticlesAssociations"; // productions before 23.5 + assoc_branch_name = "ReconstructedParticlesAssociations"; // productions before 23.5 TTreeReaderArray assoc_simID(tr, (assoc_branch_name+".simID").c_str()); TTreeReaderArray assoc_recID(tr, (assoc_branch_name+".recID").c_str()); TTreeReaderArray assoc_weight(tr, (assoc_branch_name+".weight").c_str()); - + // calculate Q2 weights CalculateEventQ2Weights(); @@ -301,8 +301,8 @@ void AnalysisEpic::Execute() }; // calculate DIS kinematics - if(!(kin->CalculateDIS(reconMethod))) continue; // reconstructed - if(!(kinTrue->CalculateDIS(reconMethod))) continue; // generated (truth) + if(!(kin->CalculateDIS(reconMethod))) continue; // reconstructed + if(!(kinTrue->CalculateDIS("ele"))) continue; // generated (truth) // Get the weight for this event's Q2 auto Q2weightFactor = GetEventQ2Weight(kinTrue->Q2, inLookup[chain->GetTreeNumber()]);