diff --git a/NPLib/AnnularS1/Makefile b/NPLib/AnnularS1/Makefile
index b418a5f16840bb5b25d7902463d2c423caed6385..ee646f98b283f8af99edb528ec791c4d59a4bfa7 100644
--- a/NPLib/AnnularS1/Makefile
+++ b/NPLib/AnnularS1/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/CalibrationManager/Makefile b/NPLib/CalibrationManager/Makefile
index 3b8a94b26d7f41761459dc181d3bf4f53badc91c..dacbd1f0ff6f5b160428cc101d9de2220644bc10 100755
--- a/NPLib/CalibrationManager/Makefile
+++ b/NPLib/CalibrationManager/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/DummyDetector/Makefile b/NPLib/DummyDetector/Makefile
index 1d864a05a5312e340ec75ed81070789f66fa289f..3be0b6cbad25e52f3ab40da394c6d3a33f490075 100755
--- a/NPLib/DummyDetector/Makefile
+++ b/NPLib/DummyDetector/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/GASPARD/GaspardTrackerAnnular.cxx b/NPLib/GASPARD/GaspardTrackerAnnular.cxx
index 47a405621ac8b02e3f41119d74c3d6f8bf507a9c..b16d8f90c0382bd3e3486d3f326c1de83368bf5f 100644
--- a/NPLib/GASPARD/GaspardTrackerAnnular.cxx
+++ b/NPLib/GASPARD/GaspardTrackerAnnular.cxx
@@ -1,10 +1,12 @@
#include "GaspardTrackerAnnular.h"
// C++ headers
+#include <limits>
#include <iostream>
#include <fstream>
#include <string>
#include <cmath>
+#include <stdlib.h>
// Gaspard
#include "TGaspardTrackerPhysics.h"
diff --git a/NPLib/GASPARD/GaspardTrackerAnnular.h b/NPLib/GASPARD/GaspardTrackerAnnular.h
index 33b9522d25f592a966c85e1ba052d0770241564f..367d80ba56389d812b7216f4af9f0a7e09d5bb77 100644
--- a/NPLib/GASPARD/GaspardTrackerAnnular.h
+++ b/NPLib/GASPARD/GaspardTrackerAnnular.h
@@ -63,7 +63,7 @@ public:
// Getters to retrieve the (X,Y,Z) coordinates of a pixel defined by strips (X,Y)
double GetStripPositionX(int N ,int X ,int Y) { return m_StripPositionX[N-1-m_index["Annular"]][X-1][Y-1]; }
double GetStripPositionY(int N ,int X ,int Y) { return m_StripPositionY[N-1-m_index["Annular"]][X-1][Y-1]; }
- double GetStripPositionZ(int N ,int X ,int Y) { return m_StripPositionZ[N-1-m_index["Annular"]][X-1][Y-1]; }
+ double GetStripPositionZ(int N ,int X ,int Y) { cout << N << " " << X << " " << Y << " " << endl ; return m_StripPositionZ[N-1-m_index["Annular"]][X-1][Y-1]; }
double GetNumberOfModule() { return m_NumberOfModule; }
private:
diff --git a/NPLib/GASPARD/GaspardTrackerDummyShape.cxx b/NPLib/GASPARD/GaspardTrackerDummyShape.cxx
index 7b1e104f359838256e75d88d23bdff32fe7ab85f..5b856f3b67e3da59871b831aba05b2b5817632f1 100644
--- a/NPLib/GASPARD/GaspardTrackerDummyShape.cxx
+++ b/NPLib/GASPARD/GaspardTrackerDummyShape.cxx
@@ -1,15 +1,16 @@
#include "GaspardTrackerDummyShape.h"
// C++ headers
+#include <limits>
#include <iostream>
#include <fstream>
#include <string>
#include <cmath>
+#include <stdlib.h>
// Gaspard
#include "TGaspardTrackerPhysics.h"
-
GaspardTrackerDummyShape::GaspardTrackerDummyShape(map<int, GaspardTrackerModule*> &Module,
TGaspardTrackerPhysics* &EventPhysics)
: m_ModuleTest(Module),
diff --git a/NPLib/GASPARD/GaspardTrackerSquare.cxx b/NPLib/GASPARD/GaspardTrackerSquare.cxx
index 54ec2eb747bf6540d640209bfe5bf3c8059a3f04..f2930a72df90a1713a15f650ca55b5d727e8da84 100644
--- a/NPLib/GASPARD/GaspardTrackerSquare.cxx
+++ b/NPLib/GASPARD/GaspardTrackerSquare.cxx
@@ -1,10 +1,12 @@
#include "GaspardTrackerSquare.h"
// C++ headers
+#include <limits>
#include <iostream>
#include <fstream>
#include <string>
#include <cmath>
+#include <stdlib.h>
// Gaspard
#include "TGaspardTrackerPhysics.h"
diff --git a/NPLib/GASPARD/GaspardTrackerTrapezoid.cxx b/NPLib/GASPARD/GaspardTrackerTrapezoid.cxx
index 0d7be723e3a8ed751c6be08579b43c86529bcc37..d2179f8ad63f8281f2d4252e1f5941d2c01ee277 100644
--- a/NPLib/GASPARD/GaspardTrackerTrapezoid.cxx
+++ b/NPLib/GASPARD/GaspardTrackerTrapezoid.cxx
@@ -1,10 +1,12 @@
#include "GaspardTrackerTrapezoid.h"
// C++ headers
+#include <limits>
#include <iostream>
#include <fstream>
#include <string>
#include <cmath>
+#include <stdlib.h>
// Gaspard
#include "TGaspardTrackerPhysics.h"
diff --git a/NPLib/GASPARD/Makefile b/NPLib/GASPARD/Makefile
index 8fea1b0d1a283014996c119feadf57bfa0464dbc..a3feb5627ac5879352296d3f467917edd6b2d0f9 100644
--- a/NPLib/GASPARD/Makefile
+++ b/NPLib/GASPARD/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/IORoot/Makefile b/NPLib/IORoot/Makefile
index adbf0454950b625e3be50f2d22af776deb7f13fc..ce8ea070246c8c5ca442fd1cbe3a541aa7462b37 100644
--- a/NPLib/IORoot/Makefile
+++ b/NPLib/IORoot/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/InitialConditions/Makefile b/NPLib/InitialConditions/Makefile
index 0d8c9fc4e8d44c6f7a58fe302ec9561d7297983b..ccf052580ea34b2ea1be8570968731ec4c81be6e 100644
--- a/NPLib/InitialConditions/Makefile
+++ b/NPLib/InitialConditions/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/InteractionCoordinates/Makefile b/NPLib/InteractionCoordinates/Makefile
index 9d22184999124de7defb3f654a5aceb92e432fc3..682282e96d1e3654a8042d33fa9bc4aded33d559 100644
--- a/NPLib/InteractionCoordinates/Makefile
+++ b/NPLib/InteractionCoordinates/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/MUST2/Makefile b/NPLib/MUST2/Makefile
index 483202615d51fcbee2e1ed164a130262ccad451b..ae103d89957afd3ebd94b76017c51febd7d92c2a 100644
--- a/NPLib/MUST2/Makefile
+++ b/NPLib/MUST2/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx
index 613ee835897b337da3457c1f22d906aa2c95832d..6ea861cef697ed75a8c7fa92b31f2d3dd4c77d21 100644
--- a/NPLib/MUST2/TMust2Physics.cxx
+++ b/NPLib/MUST2/TMust2Physics.cxx
@@ -26,6 +26,7 @@ using namespace LOCAL;
#include <iostream>
#include <cmath>
#include <stdlib.h>
+#include <limits>
// NPL
#include "RootInput.h"
diff --git a/NPLib/Makefile b/NPLib/Makefile
index ab3361e4866524e3e06d1dd823b3b997fc6d2617..41e9bebb433cd9760fa8882fa8e404fb6e435983 100644
--- a/NPLib/Makefile
+++ b/NPLib/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/Paris/Makefile b/NPLib/Paris/Makefile
index 02e00de1e94b259d6eed1258d34063ffd8d96ea2..3fe9d1d2301b8eda75bb589622eaf5c7398376ee 100644
--- a/NPLib/Paris/Makefile
+++ b/NPLib/Paris/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/Paris/TParisPhysics.cxx b/NPLib/Paris/TParisPhysics.cxx
index 6b744557c2ba596be3da83029dcab14205279be2..8fb3b62e5148b5d034f714dd49f1b6c1ede910dd 100644
--- a/NPLib/Paris/TParisPhysics.cxx
+++ b/NPLib/Paris/TParisPhysics.cxx
@@ -22,10 +22,12 @@
*****************************************************************************/
#include "TParisPhysics.h"
+
+// STL
#include <vector>
#include <iostream>
#include <cstdlib>
-
+#include <limits>
ClassImp(TParisPhysics)
diff --git a/NPLib/Plastic/Makefile b/NPLib/Plastic/Makefile
index 06fc2ee6055f821118bbba183e20029e06d11969..1d21b1a8c7eb2b24d8c9f22d6481bb246cbd6f26 100644
--- a/NPLib/Plastic/Makefile
+++ b/NPLib/Plastic/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/SSSD/Makefile b/NPLib/SSSD/Makefile
index f9b71f05d93a9c1fdf589d168fb97e6b1d691bc6..95d06e3e3b59a46b2f434316246de85b81b6999c 100755
--- a/NPLib/SSSD/Makefile
+++ b/NPLib/SSSD/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/Shield/Makefile b/NPLib/Shield/Makefile
index d89a5d789720e01ee3e72933cb412a5558d25051..b06b5851b14a361d043343d79f8f5bc7ce2648e1 100644
--- a/NPLib/Shield/Makefile
+++ b/NPLib/Shield/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/Shield/TShieldPhysics.cxx b/NPLib/Shield/TShieldPhysics.cxx
index dae505443bbcfdb3d733398b06bf10ed6ad8c1f3..524a5b6cdde574899065c08c6b578f55b50918ef 100644
--- a/NPLib/Shield/TShieldPhysics.cxx
+++ b/NPLib/Shield/TShieldPhysics.cxx
@@ -22,10 +22,12 @@
*****************************************************************************/
#include "TShieldPhysics.h"
+
+// STL
#include <vector>
#include <iostream>
#include <cstdlib>
-
+#include <limits>
ClassImp(TShieldPhysics)
diff --git a/NPLib/Tools/Makefile b/NPLib/Tools/Makefile
index dda7eeb7029539878be7fd7ac18e95070f026e2e..f3e167bf51ad70fc998a71f5f7c8b8406d890400 100644
--- a/NPLib/Tools/Makefile
+++ b/NPLib/Tools/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPLib/Tools/NPEnergyLoss.cxx b/NPLib/Tools/NPEnergyLoss.cxx
index f41ac75f9b09e671ac9c8875d142358d2934c5a2..afb7567cd56efcc8c5b0f1551488fbe2b8841a95 100644
--- a/NPLib/Tools/NPEnergyLoss.cxx
+++ b/NPLib/Tools/NPEnergyLoss.cxx
@@ -30,6 +30,7 @@
*****************************************************************************/
+// STL
#include <iostream>
#include <fstream>
#include <cmath>
diff --git a/NPLib/Tools/NPNucleus.cxx b/NPLib/Tools/NPNucleus.cxx
index abd0ccfaf0465927968fcaecc88a12fe19f90cda..b81f0cbf046de66f9b9b31229ca0e2e5856ac495 100644
--- a/NPLib/Tools/NPNucleus.cxx
+++ b/NPLib/Tools/NPNucleus.cxx
@@ -59,10 +59,15 @@ Nucleus::Nucleus(string isotope)
// reading the file
string line, s_name;
+ size_t space;
if (inFile.is_open()) {
while (!inFile.eof()) {
getline(inFile,line);
- s_name = line.substr(11,6);
+
+ s_name = line.substr(11,7);
+ space = s_name.find_first_of(" ");
+ s_name.resize(space);
+
if (s_name.find(Isotope) != string::npos && s_name.length() == isotope.length()) break;
}
Extract(line.data());
diff --git a/NPLib/VDetector/Makefile b/NPLib/VDetector/Makefile
index b70479c536a19cbe4e6c0071e8f64331f6a90367..450913cc343cb2a9f47debd0701ccaa67b83e973 100644
--- a/NPLib/VDetector/Makefile
+++ b/NPLib/VDetector/Makefile
@@ -41,7 +41,6 @@ ROOTLIBS := $(shell $(ROOTCONFIG) --libs)
ROOTGLIBS := $(shell $(ROOTCONFIG) --glibs)
HASTHREAD := $(shell $(ROOTCONFIG) --has-thread)
ROOTDICTTYPE := $(shell $(ROOTCONFIG) --dicttype)
-NOSTUBS := $(shell $(ROOTCONFIG) --nostubs)
ROOTCINT := rootcint
ifeq ($(ARCH),linux)
diff --git a/NPSimulation/src/GaspardScorers.cc b/NPSimulation/src/GaspardScorers.cc
index 0ec6364a2ae69b416243970fa2b932fee364b6e1..4ebfe571f015d7101b220b746a6a6a6f706988f2 100644
--- a/NPSimulation/src/GaspardScorers.cc
+++ b/NPSimulation/src/GaspardScorers.cc
@@ -695,6 +695,7 @@ G4bool GPDScorerFirstStageFrontStripAnnular::ProcessHits(G4Step* aStep, G4Toucha
G4double edep = aStep->GetTotalEnergyDeposit();
if (edep < 100*keV) return FALSE;
G4int index = aStep->GetTrack()->GetTrackID();
+ ThetaStripNumber++;
EvtMap->set(DetNbr + index, ThetaStripNumber);
return TRUE;
@@ -769,6 +770,7 @@ G4bool GPDScorerFirstStageBackStripAnnular::ProcessHits(G4Step* aStep, G4Touchab
G4double edep = aStep->GetTotalEnergyDeposit();
if (edep < 100*keV) return FALSE;
G4int index = aStep->GetTrack()->GetTrackID();
+ PhiStripNumber++;
EvtMap->set(DetNbr + index, PhiStripNumber);
return TRUE;