diff --git a/NPLib/Tiara/TTiaraHyballSpectra.cxx b/NPLib/Tiara/TTiaraHyballSpectra.cxx index b3dfe54e8e638453fa88a000209a48b974d5d93c..e4edbf7facfdf93be55b4d3f98903b6bc1d74617 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 75a1afdf6ee8524035cbe9da4463aa5acfc72f69..7d0e67b31be9c06ab247ebaef40dfed9571a5941 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 10c08a528aa629a5b7c9381fcf384f39b43766da..a2c7acc85650b1ed93aec0a69d81de90d568f5f4 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