diff --git a/NPLib/Detectors/PISTA/TPISTAPhysics.cxx b/NPLib/Detectors/PISTA/TPISTAPhysics.cxx index 95084a5c2c5857868c975c092a5b8ef12c287429..aed56416356ee6c5e6e50ff3c2f6966437401a84 100644 --- a/NPLib/Detectors/PISTA/TPISTAPhysics.cxx +++ b/NPLib/Detectors/PISTA/TPISTAPhysics.cxx @@ -110,7 +110,7 @@ void TPISTAPhysics::AddDetector(TVector3 A, TVector3 B, TVector3 C, TVector3 D){ //Strip_1_1 = A + u*(StripPitchX / 2.) + v*(StripPitchY / 2.); Strip_1_1 = A + u*deltaX + u*(ContractedStripPitchX / 2.) + v*(NumberOfStripsY*StripPitchY - StripPitchY / 2.); - Strip_1_1 = Strip_1_1 + 2.9*u + 2.0*v; + //Strip_1_1 = Strip_1_1 + 2.9*u + 2.0*v; TVector3 StripPos; for(int i=0; i<NumberOfStripsX; i++){ diff --git a/Projects/PISTA/Analysis.cxx b/Projects/PISTA/Analysis.cxx index 5943a650cea221a4b76ccea7f493dbd830b3327c..a9c20e246d5bfeaca90cca35cbf5ac1aae480d73 100644 --- a/Projects/PISTA/Analysis.cxx +++ b/Projects/PISTA/Analysis.cxx @@ -78,7 +78,8 @@ void Analysis::TreatEvent(){ TVector3 BeamDirection = InitialConditions->GetBeamDirection(); TVector3 BeamPosition(XTarget,YTarget,ZTarget); - TVector3 PositionOnTarget(0,0,0); + //TVector3 PositionOnTarget(0,0,0); + TVector3 PositionOnTarget(-1,0.5,0); //TVector3 PositionOnTarget(Rand.Gaus(XTarget, 0.6/2.35), Rand.Gaus(YTarget, 0.6/2.35), 0); //TVector3 PositionOnTarget(XTarget, YTarget, 0); BeamEnergy = 1417.;//InitialConditions->GetIncidentInitialKineticEnergy(); @@ -113,7 +114,8 @@ void Analysis::TreatEvent(){ ThetaNormalTarget = HitDirection.Angle(TVector3(0,0,1)); //Elab = Be10C.EvaluateInitialEnergy(Energy,TargetThickness*0.5,ThetaNormalTarget); - Elab = C12C.EvaluateInitialEnergy(Energy,TargetThickness*0.5,ThetaNormalTarget); + Elab = Energy; + //Elab = C12C.EvaluateInitialEnergy(Energy,TargetThickness*0.5,ThetaNormalTarget); OptimumEx = Transfer->ReconstructRelativistic(OriginalElab, OriginalThetaLab*deg); Ex = Transfer->ReconstructRelativistic(Elab, ThetaLab); ThetaCM = Transfer->EnergyLabToThetaCM(Elab, ThetaLab)/deg; diff --git a/Projects/e850/pista_e850_part1.detector b/Projects/e850/pista_e850_part1.detector new file mode 100644 index 0000000000000000000000000000000000000000..539972b62974dec5dde6aced06caa869f78a2f24 --- /dev/null +++ b/Projects/e850/pista_e850_part1.detector @@ -0,0 +1,65 @@ +%%%%%%%%%%%%%%%%%%%% +Target + THICKNESS= 0.44 micrometer + RADIUS= 5 mm + MATERIAL= C + ANGLE= 0 deg + X= 0 mm + Y= 0 mm + Z= 0 mm + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= 36.71 96.1 50.7 + POS_B= -35.92 95.8 51.3 + POS_C= -19.35 56.5 93.4 + POS_D= 20.8 56.6 93.1 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= -42.15 93.1 51.1 + POS_B= -93.62 41.8 51.6 + POS_C= -54.12 25.3 93.6 + POS_D= -25.66 53.6 93.4 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= -95.98 35.6 51.3 + POS_B= -95.63 -37.1 51.5 + POS_C= -56.22 -20.7 93.7 + POS_D= -56.39 19.5 93.6 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= -93.34 -43.5 50.9 + POS_B= -41.88 -94.8 51.3 + POS_C= -25.41 -55.2 93.2 + POS_D= -53.84 -26.8 93.0 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= -35.66 -97.1 51.3 + POS_B= 36.98 -96.9 51.1 + POS_C= 20.9 -57.4 93.4 + POS_D= -19.24 -57.6 93.5 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= 43.66 -94.4 50.9 + POS_B= 95.19 -43.3 50.8 + POS_C= 56.03 -26.6 93.1 + POS_D= 27.54 -54.9 93.2 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= 96.87 -36.8 50.3 + POS_B= 97.41 35.8 50.4 + POS_C= 57.83 20.0 92.6 + POS_D= 57.52 -20.1 92.6 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= 94.39 42.0 50.8 + POS_B= 42.94 93.3 50.7 + POS_C= 26.47 54.1 93.0 + POS_D= 54.9 25.7 93.1 diff --git a/Projects/e850/pista_e850_part2.detector b/Projects/e850/pista_e850_part2.detector new file mode 100644 index 0000000000000000000000000000000000000000..86a3ec0571201e5a91ab7b1c0943f97259c632b3 --- /dev/null +++ b/Projects/e850/pista_e850_part2.detector @@ -0,0 +1,65 @@ +%%%%%%%%%%%%%%%%%%%% +Target + THICKNESS= 0.44 micrometer + RADIUS= 5 mm + MATERIAL= C + ANGLE= 0 deg + X= 0 mm + Y= 0 mm + Z= 0 mm + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= 36.58 96.2 50.7 + POS_B= -36.06 96.1 51.1 + POS_C= -19.69 56.8 93.4 + POS_D= 20.46 56.8 93.1 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= -42.32 93.5 51.1 + POS_B= -93.68 42.2 51.5 + POS_C= -54.14 25.7 93.5 + POS_D= -25.74 54.1 93.3 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= -96.11 35.8 51.3 + POS_B= -95.9 -36.9 51.5 + POS_C= -56.48 -20.6 93.7 + POS_D= -56.58 19.6 93.6 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= -93.58 -43.6 51.0 + POS_B= -42.0 -94.7 51.3 + POS_C= -25.55 -55.1 93.2 + POS_D= -54.04 -26.8 93.1 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= -35.96 -97.3 51.4 + POS_B= 36.67 -97.1 50.9 + POS_C= 20.73 -57.2 92.8 + POS_D= -19.41 -57.3 93.1 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= 43.74 -94.7 50.8 + POS_B= 95.19 -43.5 50.8 + POS_C= 55.98 -26.8 93.0 + POS_D= 27.53 -55.1 93.0 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= 97.15 -37.1 50.1 + POS_B= 97.49 35.6 49.9 + POS_C= 57.64 19.8 91.9 + POS_D= 57.43 -20.3 92.0 + +%%%%%%%%%%%%%%%%%%%% +PISTA + POS_A= 94.08 42.0 51.0 + POS_B= 42.78 93.4 50.9 + POS_C= 26.27 54.4 93.4 + POS_D= 54.6 25.9 93.4