diff --git a/Armory/ClassPW.h b/Armory/ClassPW.h index 8442257..b34cc90 100755 --- a/Armory/ClassPW.h +++ b/Armory/ClassPW.h @@ -122,7 +122,7 @@ private: // const float zLen = 348.6; // mm const float zLen = 174.3 * 2; // mm const float radiusA = 37; - const float radiusC = 43; + const float radiusC = 42; double dAngle; double anodeLength; @@ -626,7 +626,7 @@ inline double PW::GetZ0() // cathodes see the induced/mirror charge, and the guard wires are field-shaping, not read out. const double kPCHyperbC = 301.895; const double kPCAnodeWaist = 32.0429; // ring radius 37 mm -- readout -const double kPCCathodeWaist = 32.0429 * 43.0 / 37.0; // ring radius 43 mm -- induced charge +const double kPCCathodeWaist = 32.0429 * 42.0 / 37.0; // ring radius 43 mm -- induced charge const double kPCGuardWaist = 32.0429 * 32.0 / 37.0; // ring radius 32 mm -- not read out // Intersection of the segment x1 -> x1+dx with the one-sheet hyperboloid of waist a, flare c. diff --git a/Armory/PCZRecon.h b/Armory/PCZRecon.h index a02c852..1f93833 100644 --- a/Armory/PCZRecon.h +++ b/Armory/PCZRecon.h @@ -314,7 +314,8 @@ inline double a1c2_zfix(double z) { double result = z; double slope = 0.52; - double z_grid[8] = {147.998, 101.946, 59.7634, 19.6965, -19.6965, -59.7634, -101.946, -147.998}; + double z_grid[8] = {148.2677, 102.1111, 59.8527, 19.7248, -19.7248, -59.8527, -102.1111, -148.2677}; + for (int i = 0; i < 7; i++) { if (z <= z_grid[i] && z > z_grid[i + 1]) diff --git a/TrackRecon.C b/TrackRecon.C index 4bad71f..e14b871 100644 --- a/TrackRecon.C +++ b/TrackRecon.C @@ -269,8 +269,7 @@ struct AAEjectileMasses double m_p, m_rp; // proton ejectile, recoil }; -const double a1c1_zg[8] = {147.998, 101.946, 59.7634, 19.6965, -19.6965, -59.7634, -101.946, -147.998}; - +const double a1c1_zg[8] = {148.2677, 102.1111, 59.8527, 19.7248, -19.7248, -59.8527, -102.1111, -148.2677}; // cell: 0 1 2 3 4 5 6 static const double a1c1_cfmin_17F[7] = {0.410, 0.420, 0.398, 0.415, 0.402, 0.420, 0.410}; static const double a1c1_k_17F[7] = {0.075, 0.099, 0.086, 0.069, 0.163, 0.099, 0.075};