From 18e34cf447fc3bb9f0ae2aa9401e01789e448896 Mon Sep 17 00:00:00 2001
From: Nicolas de Sereville <deserevi@ipno.in2p3.fr>
Date: Wed, 4 Dec 2013 15:29:48 +0100
Subject: [PATCH] + -j 10 option in NPSimulation/Makefile
+ TTiaraHyballSpectra now aware of TTiaraPhysics
---
NPLib/Tiara/TTiaraHyballSpectra.cxx | 42 ++++++++++++++---------------
NPLib/Tiara/TTiaraHyballSpectra.h | 6 ++---
NPSimulation/Makefile | 2 +-
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/NPLib/Tiara/TTiaraHyballSpectra.cxx b/NPLib/Tiara/TTiaraHyballSpectra.cxx
index b3dfe54e8..e4edbf7fa 100644
--- a/NPLib/Tiara/TTiaraHyballSpectra.cxx
+++ b/NPLib/Tiara/TTiaraHyballSpectra.cxx
@@ -276,31 +276,31 @@ void TTiaraHyballSpectra::FillPreTreatedSpectra(TTiaraHyballData* PreTreatedData
}
-/*
+
////////////////////////////////////////////////////////////////////////////////
void TTiaraHyballSpectra::FillPhysicsSpectra(TTiaraHyballPhysics* Physics)
{
-TString name;
-TString family= "TIARA/HYBALL/PHY";
-// X-Y Impact Matrix
-
-for(unsigned int i = 0 ; i < Physics->Si_E.size(); i++){
-name = "MM_IMPACT_MATRIX";
-double x = Physics->GetPositionOfInteraction(i).x();
-double y = Physics->GetPositionOfInteraction(i).y();
-GetHisto(family,name)-> Fill(x,y);
-
-name = "MM_THETA_E";
-double Theta = Physics->GetPositionOfInteraction(i).Angle(TVector3(0,0,1));
-Theta = Theta/deg;
-GetHisto(family,name)-> Fill(Theta,Physics->Si_E[i]);
-
-// STRX_E_CAL
-name = Form("MM%d_XY_COR", Physics->TelescopeNumber[i]);
-GetHisto(family,name)-> Fill(Physics->Si_EX[i],Physics->Si_EY[i]);
-}
+/* TString name;
+ TString family= "TIARA/HYBALL/PHY";
+ // X-Y Impact Matrix
+
+ for(unsigned int i = 0 ; i < Physics->Si_E.size(); i++){
+ name = "MM_IMPACT_MATRIX";
+ double x = Physics->GetPositionOfInteraction(i).x();
+ double y = Physics->GetPositionOfInteraction(i).y();
+ GetHisto(family,name)-> Fill(x,y);
+
+ name = "MM_THETA_E";
+ double Theta = Physics->GetPositionOfInteraction(i).Angle(TVector3(0,0,1));
+ Theta = Theta/deg;
+ GetHisto(family,name)-> Fill(Theta,Physics->Si_E[i]);
+
+ // STRX_E_CAL
+ name = Form("MM%d_XY_COR", Physics->TelescopeNumber[i]);
+ GetHisto(family,name)-> Fill(Physics->Si_EX[i],Physics->Si_EY[i]);
+ }*/
}
- */
+
////////////////////////////////////////////////////////////////////////////////
diff --git a/NPLib/Tiara/TTiaraHyballSpectra.h b/NPLib/Tiara/TTiaraHyballSpectra.h
index 75a1afdf6..7d0e67b31 100644
--- a/NPLib/Tiara/TTiaraHyballSpectra.h
+++ b/NPLib/Tiara/TTiaraHyballSpectra.h
@@ -31,7 +31,7 @@
// NPLib headers
#include "TTiaraHyballData.h"
-//#include "TTiaraHyballPhysics.h"
+#include "TTiaraHyballPhysics.h"
// C++ STL headers
#include <map>
@@ -39,7 +39,7 @@ using namespace std;
// Forward Declaration
-//class TTiaraHyballPhysics;
+class TTiaraHyballPhysics;
class TTiaraHyballSpectra {
@@ -63,7 +63,7 @@ class TTiaraHyballSpectra {
// Filling methods
void FillRawSpectra(TTiaraHyballData*);
void FillPreTreatedSpectra(TTiaraHyballData*);
-// void FillPhysicsSpectra(TTiaraHyballPhysics*);
+ void FillPhysicsSpectra(TTiaraHyballPhysics*);
public:
// get map histo which will be used for GSpectra in GUser
diff --git a/NPSimulation/Makefile b/NPSimulation/Makefile
index 10c08a528..a2c7acc85 100644
--- a/NPSimulation/Makefile
+++ b/NPSimulation/Makefile
@@ -12,7 +12,7 @@ DelIncSrcFiles:
./scripts/deletefiles.sh
NPSimulation:
- make -j -f Makefile.geant4
+ make -j 10 -f Makefile.geant4
clean:
./scripts/deletefiles.sh
--
GitLab