From bdb943bccb670474ef8cf2ee998662d1ade85879 Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Wed, 13 Feb 2013 12:16:32 +0000
Subject: [PATCH] * Changing NPA project to fit the new TInitialCondition
---
NPAnalysis/10He_Riken/Analysis.cxx | 8 ++++----
NPAnalysis/Gaspard/Analysis.cxx | 10 +++++-----
NPAnalysis/Hyde/Analysis.cxx | 10 +++++-----
NPAnalysis/Paris/Analysis.cxx | 2 +-
NPAnalysis/W1/Analysis.cxx | 10 +++++-----
NPAnalysis/must2/Analysis.cxx | 8 ++++----
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/NPAnalysis/10He_Riken/Analysis.cxx b/NPAnalysis/10He_Riken/Analysis.cxx
index 337854f57..f0216ad77 100644
--- a/NPAnalysis/10He_Riken/Analysis.cxx
+++ b/NPAnalysis/10He_Riken/Analysis.cxx
@@ -120,12 +120,12 @@ int main(int argc,char** argv)
myDetector -> BuildPhysicalEvent() ;
////
// Target (from initial condition)
- XTarget = Init->GetICPositionX(0);
- YTarget = Init->GetICPositionY(0);
- ZTarget = Init->GetICPositionZ(0);
+ XTarget = Init->GetIncidentPositionX();
+ YTarget = Init->GetIncidentPositionY();
+ ZTarget = Init->GetIncidentPositionZ();
// XTarget = RandomEngine.Gaus(Init->GetICPositionX(0),1);
// YTarget = RandomEngine.Gaus(Init->GetICPositionY(0),1);
- BeamTheta = Init->GetICIncidentAngleTheta(0)*deg ; BeamPhi = Init->GetICIncidentAnglePhi(0)*deg ;
+ BeamTheta = Init->GetIncidentEmittanceTheta()*deg ; BeamPhi = Init->GetIncidentEmittancePhi()*deg ;
TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta) , sin(BeamPhi)*sin(BeamTheta) , cos(BeamTheta)) ;
////
diff --git a/NPAnalysis/Gaspard/Analysis.cxx b/NPAnalysis/Gaspard/Analysis.cxx
index 87c382706..6df1284b1 100644
--- a/NPAnalysis/Gaspard/Analysis.cxx
+++ b/NPAnalysis/Gaspard/Analysis.cxx
@@ -121,7 +121,7 @@ int main(int argc,char** argv)
TVector3 A;
if (E > -1000) {
// Get c.m. angle
- ThetaCM = initCond->GetICEmittedAngleThetaCM(0) * deg;
+ ThetaCM = initCond->GetThetaCM(0) * deg;
// Get exact scattering angle from TInteractionCoordinates object
// interCoord->Dump();
@@ -136,10 +136,10 @@ int main(int argc,char** argv)
A = GPDTrack->GetPositionOfInteraction();
// Get beam interaction coordinates on target (from initial condition)
- XTarget = initCond->GetICPositionX(0);
- YTarget = initCond->GetICPositionY(0);
- BeamTheta = initCond->GetICIncidentAngleTheta(0)*deg;
- BeamPhi = initCond->GetICIncidentAnglePhi(0)*deg;
+ XTarget = initCond->GetIncidentPositionX();
+ YTarget = initCond->GetIncidentPositionY();
+ BeamTheta = initCond->GetIncidentEmittanceTheta()*deg;
+ BeamPhi = initCond->GetIncidentEmittanceTheta()*deg;
TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta), sin(BeamPhi)*sin(BeamTheta), cos(BeamTheta));
// Hit direction taking into account beam position on target
diff --git a/NPAnalysis/Hyde/Analysis.cxx b/NPAnalysis/Hyde/Analysis.cxx
index 1d37c5332..da1ba2a8c 100644
--- a/NPAnalysis/Hyde/Analysis.cxx
+++ b/NPAnalysis/Hyde/Analysis.cxx
@@ -120,7 +120,7 @@ int main(int argc,char** argv)
TVector3 A;
if (E > -1000) {
// Get c.m. angle
- ThetaCM = initCond->GetICEmittedAngleThetaCM(0) * deg;
+ ThetaCM = initCond->GetThetaCM(0) * deg;
// Get exact scattering angle from TInteractionCoordinates object
// Theta = interCoord->GetDetectedAngleTheta(0) * deg;
@@ -134,11 +134,11 @@ int main(int argc,char** argv)
A = HYDTrack->GetPositionOfInteraction();
// Get beam interaction coordinates on target (from initial condition)
- XTarget = initCond->GetICPositionX(0);
- YTarget = initCond->GetICPositionY(0);
+ XTarget = initCond->GetIncidentPositionX();
+ YTarget = initCond->GetIncidentPositionY();
// cout << XTarget << " " << YTarget << endl;
- BeamTheta = initCond->GetICIncidentAngleTheta(0)*deg;
- BeamPhi = initCond->GetICIncidentAnglePhi(0)*deg;
+ BeamTheta = initCond->GetIncidentEmittanceTheta()*deg;
+ BeamPhi = initCond->GetIncidentEmittancePhi()*deg;
TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta), sin(BeamPhi)*sin(BeamTheta), cos(BeamTheta));
// cout << BeamDirection.X() << " " << BeamDirection.Y() << " " << BeamDirection.Z() << endl;
diff --git a/NPAnalysis/Paris/Analysis.cxx b/NPAnalysis/Paris/Analysis.cxx
index 9b10c2a0c..b324bec64 100644
--- a/NPAnalysis/Paris/Analysis.cxx
+++ b/NPAnalysis/Paris/Analysis.cxx
@@ -103,7 +103,7 @@ int main(int argc,char** argv)
- double Einit= initCond->GetICEmittedEnergy(0);
+ double Einit= initCond->GetKineticEnergy(0);
Ein->Fill(Einit);
diff --git a/NPAnalysis/W1/Analysis.cxx b/NPAnalysis/W1/Analysis.cxx
index 558d068b2..10b317aa0 100644
--- a/NPAnalysis/W1/Analysis.cxx
+++ b/NPAnalysis/W1/Analysis.cxx
@@ -115,16 +115,16 @@ int main(int argc,char** argv)
myDetector->BuildPhysicalEvent();
// Get Target information from TInitialConditions
- XTarget = initCond->GetICPositionX(0);
- YTarget = initCond->GetICPositionY(0);
- BeamTheta = initCond->GetICIncidentAngleTheta(0)*deg;
- BeamPhi = initCond->GetICIncidentAnglePhi(0)*deg;
+ XTarget = initCond->GetIncidentPositionX();
+ YTarget = initCond->GetIncidentPositionY();
+ BeamTheta = initCond->GetIncidentEmittanceTheta()*deg;
+ BeamPhi = initCond->GetIncidentEmittancePhi()*deg;
TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta), sin(BeamPhi)*sin(BeamTheta), cos(BeamTheta));
// loop on multiplicity event
for (int hit = 0; hit < W1->GetEventMultiplicity(); hit++) {
// Get c.m. angle
- double ThetaCM = initCond->GetICEmittedAngleThetaCM(0) * deg;
+ double ThetaCM = initCond->GetThetaCM(0) * deg;
// Get exact scattering angle from TInteractionCoordinates object
double DetecX = interCoord->GetDetectedPositionX(hit);
diff --git a/NPAnalysis/must2/Analysis.cxx b/NPAnalysis/must2/Analysis.cxx
index 7c69e2d4e..d0f0260f2 100644
--- a/NPAnalysis/must2/Analysis.cxx
+++ b/NPAnalysis/must2/Analysis.cxx
@@ -118,12 +118,12 @@ int main(int argc,char** argv)
myDetector->BuildPhysicalEvent();
// Get target interaction position from initial conditions
- double XTarget = initCond->GetICPositionX(0);
- double YTarget = initCond->GetICPositionY(0);
- double ZTarget = initCond->GetICPositionZ(0);
+ double XTarget = initCond->GetIncidentPositionX();
+ double YTarget = initCond->GetIncidentPositionY();
+ double ZTarget = initCond->GetIncidentPositionZ();
// Calculate beam direction
- double BeamTheta = initCond->GetICIncidentAngleTheta(0)*deg; double BeamPhi = initCond->GetICIncidentAnglePhi(0)*deg;
+ double BeamTheta = initCond->GetIncidentEmittanceTheta()*deg; double BeamPhi = initCond->GetIncidentEmittancePhi()*deg;
TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta) , sin(BeamPhi)*sin(BeamTheta) , cos(BeamTheta));
for (int hit = 0; hit < M2->Si_E.size(); hit++) {
--
GitLab