From ff0660f3f8e5268e3c3a94d462e9755e545564d7 Mon Sep 17 00:00:00 2001
From: deserevi <deserevi@nptool>
Date: Wed, 22 Dec 2010 12:40:59 +0000
Subject: [PATCH] * Remove std output used for debugging purposes in NPL
* Add screen outputs for Gaspard NPA
---
NPAnalysis/Gaspard/src/Analysis.cc | 17 +++++++++--------
NPLib/GASPARD/GaspardTrackerAnnular.cxx | 4 ++--
NPLib/GASPARD/GaspardTrackerSquare.cxx | 4 ++--
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/NPAnalysis/Gaspard/src/Analysis.cc b/NPAnalysis/Gaspard/src/Analysis.cc
index dff09815c..d7f4e226a 100644
--- a/NPAnalysis/Gaspard/src/Analysis.cc
+++ b/NPAnalysis/Gaspard/src/Analysis.cc
@@ -31,18 +31,18 @@ int main(int argc,char** argv)
myDetector->ReadConfigurationFile(detectorfileName);
// Calculate beam energy at target middle
+ // Target informations
+ cout << "/////////// Target information ///////////" << endl;
+ cout << "Thickness (um): " << myDetector->GetTargetThickness() << endl;
// Get nominal beam energy
Double_t BeamEnergyNominal = myReaction->GetBeamEnergy() * MeV;
- cout << BeamEnergyNominal << endl;
+ cout << "Nominal beam energy (MeV): " << BeamEnergyNominal << endl;
// Slow beam at target middle
Double_t BeamEnergy = BeamEnergyNominal - BeamTarget.Slow(BeamEnergyNominal, myDetector->GetTargetThickness()/2 * micrometer, 0);
- cout << BeamEnergy << endl;
+ cout << "Middle-target beam energy (MeV): " << BeamEnergy << endl << endl;
// Set energy beam at target middle
myReaction->SetBeamEnergy(BeamEnergy);
- // Print target thickness
- cout << myDetector->GetTargetThickness() << endl;
-
// Attach more branch to the output
double Ex = 0 ; double ExNoStrips = 0 ; double EE = 0 ; double TT = 0 ; double X = 0 ; double Y = 0 ; int det ;
RootOutput::getInstance()->GetTree()->Branch("ExcitationEnergy",&Ex,"Ex/D") ;
@@ -70,6 +70,7 @@ int main(int argc,char** argv)
// Analysis is here!
int nentries = chain->GetEntries();
+ cout << "/////////// Loop information ///////////" << endl;
cout << "Number of entries to be analysed: " << nentries << endl;
// Default initialization
@@ -92,7 +93,7 @@ int main(int argc,char** argv)
// Get total energy
double E = GPDTrack->GetEnergyDeposit();
- cout << i << " " << E << endl;
+// cout << i << " " << E << endl;
// if there is a hit in the detector array, treat it.
double Theta, ThetaStrip, angle, ThetaCM;
@@ -111,8 +112,8 @@ int main(int argc,char** argv)
DetecX = interCoord->GetDetectedPositionX(0);
DetecY = interCoord->GetDetectedPositionY(0);
DetecZ = interCoord->GetDetectedPositionZ(0);
- cout << "Detected position :" << endl;
- cout << "\t" << DetecX << " " << DetecY << " " << DetecZ << endl;
+// cout << "Detected position :" << endl;
+// cout << "\t" << DetecX << " " << DetecY << " " << DetecZ << endl;
TVector3 Detec(DetecX, DetecY, DetecZ);
// Get interaction position in detector
diff --git a/NPLib/GASPARD/GaspardTrackerAnnular.cxx b/NPLib/GASPARD/GaspardTrackerAnnular.cxx
index 2eee7aad0..47a405621 100644
--- a/NPLib/GASPARD/GaspardTrackerAnnular.cxx
+++ b/NPLib/GASPARD/GaspardTrackerAnnular.cxx
@@ -271,7 +271,7 @@ void GaspardTrackerAnnular::AddModule(double zpos, double rmin, double rmax)
// center of theta strip
double r = rmin + thetaPitch/2 + thetaPitch*(i % NbThetaStrips);
- cout << i << " " << i%NbThetaStrips << " " << r << endl;
+// cout << i << " " << i%NbThetaStrips << " " << r << endl;
// loop on phi strips
for (int j = 0; j < NbPhiStrips*NbQuadrant; j++) {
@@ -282,7 +282,7 @@ void GaspardTrackerAnnular::AddModule(double zpos, double rmin, double rmax)
double x = r * cos(phi);
double y = r * sin(phi);
- cout << i << " " << j << " " << r << " " << phi*180/M_PI << " " << x << " " << y << endl;
+// cout << i << " " << j << " " << r << " " << phi*180/M_PI << " " << x << " " << y << endl;
// fill lineX,Y,Z
lineX.push_back(x);
lineY.push_back(y);
diff --git a/NPLib/GASPARD/GaspardTrackerSquare.cxx b/NPLib/GASPARD/GaspardTrackerSquare.cxx
index 73bcd1acd..54ec2eb74 100644
--- a/NPLib/GASPARD/GaspardTrackerSquare.cxx
+++ b/NPLib/GASPARD/GaspardTrackerSquare.cxx
@@ -311,12 +311,12 @@ void GaspardTrackerSquare::BuildPhysicalEvent()
m_EventPhysics->SetTotalEnergy(EnergyTot);
// check strip position
- cout << "strips X, Y : " << stripXE << " " << stripYE << endl;
+/* cout << "strips X, Y : " << stripXE << " " << stripYE << endl;
cout << "position : " << endl;
cout << "\t X: " << GetStripPositionX(det_ref + m_index["Square"], stripXE, stripYE) << endl;
cout << "\t Y: " << GetStripPositionY(det_ref + m_index["Square"], stripXE, stripYE) << endl;
cout << "\t Z: " << GetStripPositionZ(det_ref + m_index["Square"], stripXE, stripYE) << endl;
-
+*/
// Fill default values for second an third stages
if (!Check_SecondStage) {
m_EventPhysics->SetSecondStageEnergy(-1000);
--
GitLab