Merge branch 'NPTool.dev.prerelease' of https://github.com/adrien-matta/nptool...

Merge branch 'NPTool.dev.prerelease' of https://github.com/adrien-matta/nptool into NPTool.dev.prerelease

Merge branch 'NPTool.dev.prerelease' of https://github.com/adrien-matta/nptool...
f1fb96c4 · adrien-matta · 9fc545b7 · 84abb78a · f1fb96c4 · f1fb96c4
Commit f1fb96c4 authored 10 years ago by adrien-matta
--- a/NPTutorials/cats/README.txt
+++ b/NPTutorials/cats/README.txt
--- a/NPTutorials/cats/RunToTreat.txt
+++ b/NPTutorials/cats/RunToTreat.txt
--- a/NPTutorials/cats/ShowResult.C
+++ b/NPTutorials/cats/ShowResult.C
--- a/NPTutorials/cats/calibration.txt
+++ b/NPTutorials/cats/calibration.txt
--- a/NPTutorials/cats/configs/.DS_Store
+++ b/NPTutorials/cats/configs/.DS_Store
--- a/NPTutorials/cats/configs/ConfigCATS.dat
+++ b/NPTutorials/cats/configs/ConfigCATS.dat
--- a/NPTutorials/cats/configs/ConfigMust2.dat
+++ b/NPTutorials/cats/configs/ConfigMust2.dat
--- a/NPSimulation/GASPARD/GaspardTrackerAnnular.cc
+++ b/NPSimulation/GASPARD/GaspardTrackerAnnular.cc
@@ -854,6 +854,7 @@ void GaspardTrackerAnnular::InitializeScorers()
   // First stage scorer
   G4VPrimitiveScorer* GPDScorerFirstStage =
      new SILICONSCORERS::PS_Silicon_Annular("GPDAnnularFirstStage",
+                                             0,
                                             FirstStageRmin,
                                             FirstStageRmax,
                                             0*deg,
@@ -865,6 +866,7 @@ void GaspardTrackerAnnular::InitializeScorers()
   // Second stage scorer
   G4VPrimitiveScorer* GPDScorerSecondStage =
      new SILICONSCORERS::PS_Silicon_Annular("GPDAnnularSecondStage",
+                                             0,
                                             FirstStageRmin,
                                             FirstStageRmax,
                                             0*deg,
@@ -876,6 +878,7 @@ void GaspardTrackerAnnular::InitializeScorers()
   // Third stage scorer
   G4VPrimitiveScorer* GPDScorerThirdStage =
      new SILICONSCORERS::PS_Silicon_Annular("GPDAnnularThirdStage",
+                                             0,
                                             FirstStageRmin,
                                             FirstStageRmax,
                                             0*deg,

--- a/NPSimulation/GASPARD/GaspardTrackerSquare.cc
+++ b/NPSimulation/GASPARD/GaspardTrackerSquare.cc
@@ -750,6 +750,7 @@ void GaspardTrackerSquare::InitializeScorers()
   // First stage scorer
   G4VPrimitiveScorer* GPDScorerFirstStage =
      new SILICONSCORERS::PS_Silicon_Rectangle("GPDSquareFirstStage",
+                                               0,
                                               FirstStageFace,
                                               FirstStageFace,
                                               NumberOfStrips,
@@ -758,6 +759,7 @@ void GaspardTrackerSquare::InitializeScorers()
   // Second stage scorer
   G4VPrimitiveScorer* GPDScorerSecondStage =
      new SILICONSCORERS::PS_Silicon_Rectangle("GPDSquareSecondStage",
+                                               0,
                                               SecondStageFace,
                                               SecondStageFace,
                                               1,
@@ -766,6 +768,7 @@ void GaspardTrackerSquare::InitializeScorers()
   // Third stage scorer
   G4VPrimitiveScorer* GPDScorerThirdStage =
      new SILICONSCORERS::PS_Silicon_Rectangle("GPDSquareThirdStage",
+                                               0,
                                               ThirdStageFace,
                                               ThirdStageFace,
                                               1,