From af1ea4144a4d449d8e9d4ebe1d28effd386c61c4 Mon Sep 17 00:00:00 2001 From: James Szalkie Date: Fri, 28 Aug 2026 12:25:50 -0400 Subject: [PATCH] resolution updates --- .vscode/settings.json | 3 ++- Armory/anasenMS.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 5e66083..5d5c167 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -127,5 +127,6 @@ "inspect.C": "cpp" }, "github-enterprise.uri": "https://fsunuc.physics.fsu.edu", - "C_Cpp.default.compilerPath": "/usr/bin/gcc" + "C_Cpp.default.compilerPath": "/usr/bin/gcc", + "cmake.sourceDirectory": "/home/jamesszalkie/anasen/Armory/AnasenG4" } \ No newline at end of file diff --git a/Armory/anasenMS.cpp b/Armory/anasenMS.cpp index 9d92c58..b3642c4 100644 --- a/Armory/anasenMS.cpp +++ b/Armory/anasenMS.cpp @@ -495,7 +495,7 @@ int main(int argc, char **argv){ vertexZ = beamEntranceZ + beamPath_cm * 10.0; // cm -> mm // transverse sampling range from the beam's distance straggle at this energy - const double sigmaX_mm = std::max(0.0, sigmaXBeam->Eval(beamEnergy)) * 100.0; // cm -> mm + const double sigmaX_mm = std::max(0.0, sigmaXBeam->Eval(beamEnergy)) * 10.0; // cm -> mm //vertexX = 2.0 * sigmaX_mm * gRandom->Rndm() - sigmaX_mm; //vertexY = 2.0 * sigmaX_mm * gRandom->Rndm() - sigmaX_mm; double vertexRangeX = std::sqrt((vertexXRange[1] * vertexXRange[1]) + (sigmaX_mm * sigmaX_mm)); @@ -655,7 +655,7 @@ int main(int argc, char **argv){ double hitY = hitSigma.Y(); double hitZ = hitSigma.Z(); - originalEnergy = CalculateOriginalEnergy(hitX, hitY, hitZ, + originalEnergy = CalculateOriginalEnergy(std::lround(hitX), std::lround(hitY), std::lround(hitZ), 0, 0, std::lround(vertexZ / 10) * 10, b, "He", Esx3, distance_sx3); @@ -687,7 +687,7 @@ int main(int argc, char **argv){ //tree1->Fill(); Kinematics apkin_27Al(26.981538408,4.00260325413,1.00782503224,29.973770136,beamEnergy/26.981538408); //m3 is proton - Ex_recon = apkin_27Al.getExc(originalEnergy, std::lround(thetab / 10) * 10); + Ex_recon = apkin_27Al.getExc(originalEnergy, std::lround(thetab)); //EBeam_Kin_gs = apkin_27Al.getEbeam_givenQ(Esx3, 0.0, thetab); //EBeam_Kin_2_2 = apkin_27Al.getEbeam_givenQ(Esx3, 2.2, thetab); //EBeam_Kin_3_4 = apkin_27Al.getEbeam_givenQ(Esx3, 3.4, thetab);