diff --git a/NPSimulation/include/AnnularS1.hh b/NPSimulation/include/AnnularS1.hh
index 2805c6865c47639a86c688b7c7c3e7185aee8aa1..d21ca62a615d48983c1b65be9a7da38369916411 100644
--- a/NPSimulation/include/AnnularS1.hh
+++ b/NPSimulation/include/AnnularS1.hh
@@ -1,5 +1,7 @@
+#ifndef AnnularS1_h
+#define AnnularS1_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -20,9 +22,6 @@
* *
*****************************************************************************/
-#ifndef AnnularS1_h
-#define AnnularS1_h 1
-
// C++ headers
#include <vector>
using namespace std;
diff --git a/NPSimulation/include/AnnularS1Scorers.hh b/NPSimulation/include/AnnularS1Scorers.hh
index bb8b11a0fec258338f8ebb7452094d6d09bc5610..8703693a7639318bfa2336b7890bcd6ec96676e8 100644
--- a/NPSimulation/include/AnnularS1Scorers.hh
+++ b/NPSimulation/include/AnnularS1Scorers.hh
@@ -1,5 +1,7 @@
+#ifndef AnnularS1Scorers_h
+#define AnnularS1Scorers_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,13 +21,9 @@
* *
*****************************************************************************/
-#ifndef AnnularS1Scorers_h
-#define AnnularS1Scorers_h 1
-
#include "G4VPrimitiveScorer.hh"
#include "G4THitsMap.hh"
-
namespace S1SCORERS
{
// This Threshold is used in all scorers
diff --git a/NPSimulation/include/Chamber.hh b/NPSimulation/include/Chamber.hh
index a543eaa107af00731b25db113f9acaffb11778ee..e12941cf1c57d64e634c8f209921bb4f57f7053f 100644
--- a/NPSimulation/include/Chamber.hh
+++ b/NPSimulation/include/Chamber.hh
@@ -1,7 +1,7 @@
#ifndef Chamber2Array_h
#define Chamber2Array_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/ComptonTelescope.hh b/NPSimulation/include/ComptonTelescope.hh
index 7e4b1cd28f75629ff4f707c21e5da5ab90a84b1c..f0a931c4b1fbaf45ad9e84a50b8959d51131e5d1 100755
--- a/NPSimulation/include/ComptonTelescope.hh
+++ b/NPSimulation/include/ComptonTelescope.hh
@@ -1,5 +1,7 @@
+#ifndef ComptonTelescope_h
+#define ComptonTelescope_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef ComptonTelescope_h
-#define ComptonTelescope_h 1
+
// NPTool headers
#include "VDetector.hh"
diff --git a/NPSimulation/include/ComptonTelescopeScorers.hh b/NPSimulation/include/ComptonTelescopeScorers.hh
index 502212ac8fc51296fdafb3b9b14f31ab59d2f565..369bc5b3c821148f44cd6bef0aa6aca9bb4d303f 100755
--- a/NPSimulation/include/ComptonTelescopeScorers.hh
+++ b/NPSimulation/include/ComptonTelescopeScorers.hh
@@ -1,5 +1,7 @@
+#ifndef ComptonTelescopeScorer_h
+#define ComptonTelescopeScorer_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef ComptonTelescopeScorer_h
-#define ComptonTelescopeScorer_h 1
+
#include "G4VPrimitiveScorer.hh"
#include "G4THitsMap.hh"
diff --git a/NPSimulation/include/DetectorConstruction.hh b/NPSimulation/include/DetectorConstruction.hh
index e3b63699879ac04b16ab36fce3454518d864a853..021b44abdb7df301d3e79c475dfe2a69feb72b11 100644
--- a/NPSimulation/include/DetectorConstruction.hh
+++ b/NPSimulation/include/DetectorConstruction.hh
@@ -1,7 +1,7 @@
#ifndef DetectorConstruction_H
#define DetectorConstruction_H 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/DummyDetector.hh b/NPSimulation/include/DummyDetector.hh
index 89ccc759ad4b6edb19f288d240360b9cb64b4db3..74b66c39e942010de75af65adb6a95ed51028f18 100644
--- a/NPSimulation/include/DummyDetector.hh
+++ b/NPSimulation/include/DummyDetector.hh
@@ -1,7 +1,7 @@
#ifndef DUMMYDetector_h
#define DUMMYDetector_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/Eurogam.hh b/NPSimulation/include/Eurogam.hh
index de98ef5a8495a1c77d2e7526d77c98b862e74412..714c663d5f9fc6284e12fb9c7eba33671a8a2886 100755
--- a/NPSimulation/include/Eurogam.hh
+++ b/NPSimulation/include/Eurogam.hh
@@ -1,7 +1,7 @@
#ifndef Eurogam_h
#define Eurogam_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/EventAction.hh b/NPSimulation/include/EventAction.hh
index 6cc16bd694b129b740b733a9d4a792945f27b21b..1a81baf0a094359fc81dd6deb5bf2d9ddf1842c1 100644
--- a/NPSimulation/include/EventAction.hh
+++ b/NPSimulation/include/EventAction.hh
@@ -1,7 +1,7 @@
#ifndef EventAction_h
#define EventAction_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/EventGeneratorBeam.hh b/NPSimulation/include/EventGeneratorBeam.hh
index 3cf17cefb0b067a621d49f043f892135bd2691cd..099f4ce4962e06fc4bbb716d9df9e2d33fa7f9f8 100644
--- a/NPSimulation/include/EventGeneratorBeam.hh
+++ b/NPSimulation/include/EventGeneratorBeam.hh
@@ -1,7 +1,7 @@
#ifndef EventGeneratorBeam_h
#define EventGeneratorBeam_h
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/EventGeneratorGammaDecay.hh b/NPSimulation/include/EventGeneratorGammaDecay.hh
index ed0aba76c4cdc2f53384265105bbca5d2cbce1dd..3cfd1d2e056be2114e416024ed1e96a6c96fd59e 100644
--- a/NPSimulation/include/EventGeneratorGammaDecay.hh
+++ b/NPSimulation/include/EventGeneratorGammaDecay.hh
@@ -1,7 +1,7 @@
#ifndef EventGeneratorGammaDecay_H
#define EventGeneratorGammaDecay_H
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/EventGeneratorIsotropic.hh b/NPSimulation/include/EventGeneratorIsotropic.hh
index 2da702dbf920b2490fa6e0e837f7e92102779117..3564bf6e3984baf8f706d548ca6eb41968263490 100644
--- a/NPSimulation/include/EventGeneratorIsotropic.hh
+++ b/NPSimulation/include/EventGeneratorIsotropic.hh
@@ -1,7 +1,7 @@
#ifndef EventGeneratorIsotropic_h
#define EventGeneratorIsotropic_h
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/EventGeneratorParticleDecay.hh b/NPSimulation/include/EventGeneratorParticleDecay.hh
index 93fc17f6aff5d725b05679a691558f6d772ff680..c38bf69b4d9fdee374eac7c93543054abdca42ca 100644
--- a/NPSimulation/include/EventGeneratorParticleDecay.hh
+++ b/NPSimulation/include/EventGeneratorParticleDecay.hh
@@ -1,7 +1,7 @@
#ifndef EventGeneratorParticleDecay_H
#define EventGeneratorParticleDecay_H
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/EventGeneratorTwoBodyReaction.hh b/NPSimulation/include/EventGeneratorTwoBodyReaction.hh
index b4143e2463abf0cbb9851a149e5148fcc6ebee14..85389059bba75a0349b38491eca3f9d4d9ca840a 100644
--- a/NPSimulation/include/EventGeneratorTwoBodyReaction.hh
+++ b/NPSimulation/include/EventGeneratorTwoBodyReaction.hh
@@ -1,7 +1,7 @@
#ifndef EventGeneratorTwoBodyReaction_H
#define EventGeneratorTwoBodyReaction_H
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/GaspardScorers.hh b/NPSimulation/include/GaspardScorers.hh
index aa9c60d22bf216d186d4934991f12115e65c9f56..2e88e33a98ea89e7a625dc1c10ea9ed98664f01d 100644
--- a/NPSimulation/include/GaspardScorers.hh
+++ b/NPSimulation/include/GaspardScorers.hh
@@ -1,5 +1,7 @@
+#ifndef GPDScorer_h
+#define GPDScorer_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,9 +21,6 @@
* *
*****************************************************************************/
-#ifndef GPDScorer_h
-#define GPDScorer_h 1
-
#include "G4VPrimitiveScorer.hh"
#include "G4THitsMap.hh"
diff --git a/NPSimulation/include/GaspardTracker.hh b/NPSimulation/include/GaspardTracker.hh
index 4ca87d728a57b715068469d799170ceb8ebe89d8..69175a7d5bb8ed5dbe881e725fa975abf90f2e6d 100644
--- a/NPSimulation/include/GaspardTracker.hh
+++ b/NPSimulation/include/GaspardTracker.hh
@@ -1,5 +1,7 @@
+#ifndef GaspardTracker_h
+#define GaspardTracker_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -20,9 +22,6 @@
* *
*****************************************************************************/
-#ifndef GaspardTracker_h
-#define GaspardTracker_h 1
-
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/GaspardTrackerAnnular.hh b/NPSimulation/include/GaspardTrackerAnnular.hh
index 3e6ab8b68d8c08e92b4620397efdc4fe565e1350..e5c2882ca2101baf780e47335d2ce045a70706bc 100644
--- a/NPSimulation/include/GaspardTrackerAnnular.hh
+++ b/NPSimulation/include/GaspardTrackerAnnular.hh
@@ -1,5 +1,7 @@
+#ifndef GaspardTrackerAnnular_h
+#define GaspardTrackerAnnular_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,6 @@
* *
*****************************************************************************/
-#ifndef GaspardTrackerAnnular_h
-#define GaspardTrackerAnnular_h 1
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/GaspardTrackerDummyShape.hh b/NPSimulation/include/GaspardTrackerDummyShape.hh
index 85e3f785773c967a12f86ec1a1e9221f395bfb8d..2295cba7018c3d11d74cc89fe195b00eaaa2a34d 100644
--- a/NPSimulation/include/GaspardTrackerDummyShape.hh
+++ b/NPSimulation/include/GaspardTrackerDummyShape.hh
@@ -1,5 +1,7 @@
+#ifndef GaspardTrackerDummyShape_h
+#define GaspardTrackerDummyShape_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -21,8 +23,7 @@
* *
*****************************************************************************/
-#ifndef GaspardTrackerDummyShape_h
-#define GaspardTrackerDummyShape_h 1
+
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/GaspardTrackerModule.hh b/NPSimulation/include/GaspardTrackerModule.hh
index 43335d27f7a9df0b5c9054ef8ca66630f8b077d6..efd99b36baa2c88aefbd94df4ac84c9f3c81febd 100644
--- a/NPSimulation/include/GaspardTrackerModule.hh
+++ b/NPSimulation/include/GaspardTrackerModule.hh
@@ -1,5 +1,7 @@
+#ifndef GaspardTrackerModule_h
+#define GaspardTrackerModule_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef GaspardTrackerModule_h
-#define GaspardTrackerModule_h 1
+
// C++ headers
#include <string>
diff --git a/NPSimulation/include/GaspardTrackerSquare.hh b/NPSimulation/include/GaspardTrackerSquare.hh
index 6d699163276372f2a93d420272e3a6bf7e252461..f10b9cb9d417ef0688a2c0218a8eac7dec9c4a81 100644
--- a/NPSimulation/include/GaspardTrackerSquare.hh
+++ b/NPSimulation/include/GaspardTrackerSquare.hh
@@ -1,5 +1,7 @@
+#ifndef GaspardTrackerSquare_h
+#define GaspardTrackerSquare_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,9 +21,6 @@
* *
*****************************************************************************/
-#ifndef GaspardTrackerSquare_h
-#define GaspardTrackerSquare_h 1
-
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/GaspardTrackerTrapezoid.hh b/NPSimulation/include/GaspardTrackerTrapezoid.hh
index c5578b7c833a8440d8b1271adfdfd2d07b14f193..9834babc3c4921e179ca6c4e29e3834605db47c3 100644
--- a/NPSimulation/include/GaspardTrackerTrapezoid.hh
+++ b/NPSimulation/include/GaspardTrackerTrapezoid.hh
@@ -1,5 +1,7 @@
+#ifndef GaspardTrackerTrapezoid_h
+#define GaspardTrackerTrapezoid_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef GaspardTrackerTrapezoid_h
-#define GaspardTrackerTrapezoid_h 1
+
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/GeneralScorers.hh b/NPSimulation/include/GeneralScorers.hh
index 57e01667fafd8ba73ab835dbdffcd47137874175..7371587438750b6cdf524601b5bcb59607f48890 100644
--- a/NPSimulation/include/GeneralScorers.hh
+++ b/NPSimulation/include/GeneralScorers.hh
@@ -1,7 +1,7 @@
#ifndef GeneralScorers_h
#define GeneralScorers_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/HydeScorers.hh b/NPSimulation/include/HydeScorers.hh
index 8535d2085ad1db6eec428caeb89379de767884a5..8f28a3e496368a3cd532f684728b73c26015dab6 100644
--- a/NPSimulation/include/HydeScorers.hh
+++ b/NPSimulation/include/HydeScorers.hh
@@ -1,5 +1,7 @@
+#ifndef HYDScorer_h
+#define HYDScorer_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -12,16 +14,13 @@
* Last update : *
*---------------------------------------------------------------------------*
* Decription: This class holds all the scorers needed by the *
- * HydeTracker*** objects. *
+ * HydeTracker*** objects. *
*---------------------------------------------------------------------------*
* Comment: *
* *
* *
*****************************************************************************/
-#ifndef HYDScorer_h
-#define HYDScorer_h 1
-
#include "G4VPrimitiveScorer.hh"
#include "G4THitsMap.hh"
diff --git a/NPSimulation/include/HydeTracker.hh b/NPSimulation/include/HydeTracker.hh
index a8ad82ca259fbf63d720931db19b03b478379c13..0ada0c5ed32a9e14c428018be1ed264a27ce219f 100644
--- a/NPSimulation/include/HydeTracker.hh
+++ b/NPSimulation/include/HydeTracker.hh
@@ -1,5 +1,8 @@
+#ifndef HydeTracker_h
+#define HydeTracker_h 1
+
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -11,8 +14,8 @@
* Creation Date : 10/06/09 *
* Last update : *
*---------------------------------------------------------------------------*
- * Decription: This class manages different shapes of module for the Hyde *
- * tracker. It allows to have Hyde geometries with an *
+ * Decription: This class manages different shapes of module for the Hyde *
+ * tracker. It allows to have Hyde geometries with an *
* heterogeneous set of modules *
*---------------------------------------------------------------------------*
* Comment: *
@@ -20,9 +23,6 @@
* *
*****************************************************************************/
-#ifndef HydeTracker_h
-#define HydeTracker_h 1
-
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/HydeTrackerAnnular.hh b/NPSimulation/include/HydeTrackerAnnular.hh
index d7b219030a4ab6c7af444c34e145e9cabb4afc8f..9ddc9ce894a42e14a7d8704c9b5c425989ec8f37 100644
--- a/NPSimulation/include/HydeTrackerAnnular.hh
+++ b/NPSimulation/include/HydeTrackerAnnular.hh
@@ -1,5 +1,7 @@
+#ifndef HydeTrackerAnnular_h
+#define HydeTrackerAnnular_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -11,7 +13,7 @@
* Creation Date : 15/07/09 *
* Last update : *
*---------------------------------------------------------------------------*
- * Decription: Define a module of annular shape for the Hyde tracker *
+ * Decription: Define a module of annular shape for the Hyde tracker *
* *
*---------------------------------------------------------------------------*
* Comment: *
@@ -19,9 +21,6 @@
* *
*****************************************************************************/
-#ifndef HydeTrackerAnnular_h
-#define HydeTrackerAnnular_h 1
-
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/HydeTrackerDummyShape.hh b/NPSimulation/include/HydeTrackerDummyShape.hh
index 8564b8e320d138d300da1062506e87b33cbb93dc..0ca74aa316ec8043bf7221ac8095356ac08d29fb 100644
--- a/NPSimulation/include/HydeTrackerDummyShape.hh
+++ b/NPSimulation/include/HydeTrackerDummyShape.hh
@@ -1,5 +1,7 @@
+#ifndef HydeTrackerDummyShape_h
+#define HydeTrackerDummyShape_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -11,9 +13,9 @@
* Creation Date : 03/09/09 *
* Last update : *
*---------------------------------------------------------------------------*
- * Decription: Define a dummy module for the Hyde tracker *
+ * Decription: Define a dummy module for the Hyde tracker *
* The goal of this class is to be a starting point to create a *
- * new shape to be added to the Hyde tracker. *
+ * new shape to be added to the Hyde tracker. *
* *
*---------------------------------------------------------------------------*
* Comment: *
@@ -21,9 +23,6 @@
* *
*****************************************************************************/
-#ifndef HydeTrackerDummyShape_h
-#define HydeTrackerDummyShape_h 1
-
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/HydeTrackerModule.hh b/NPSimulation/include/HydeTrackerModule.hh
index d3c8cdc13ef901f669491142f385571a9de357c1..e2429960e1d3186c8b6e711acfb1de7bf39b418f 100644
--- a/NPSimulation/include/HydeTrackerModule.hh
+++ b/NPSimulation/include/HydeTrackerModule.hh
@@ -1,5 +1,7 @@
+#ifndef HydeTrackerModule_h
+#define HydeTrackerModule_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -12,16 +14,13 @@
* Last update : *
*---------------------------------------------------------------------------*
* Decription: This class is an Abstract Base Class (ABC) from which should *
- * derive all different modules from the Hyde tracker. *
+ * derive all different modules from the Hyde tracker. *
*---------------------------------------------------------------------------*
* Comment: *
* *
* *
*****************************************************************************/
-#ifndef HydeTrackerModule_h
-#define HydeTrackerModule_h 1
-
// C++ headers
#include <string>
#include <vector>
diff --git a/NPSimulation/include/HydeTrackerSquare.hh b/NPSimulation/include/HydeTrackerSquare.hh
index be0a871e0e894bad2d590d8771080d476713a7ad..6d317558a07f689e6138cc4a6b7b37c97f54a713 100644
--- a/NPSimulation/include/HydeTrackerSquare.hh
+++ b/NPSimulation/include/HydeTrackerSquare.hh
@@ -1,5 +1,7 @@
+#ifndef HydeTrackerSquare_h
+#define HydeTrackerSquare_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,9 +21,6 @@
* *
*****************************************************************************/
-#ifndef HydeTrackerSquare_h
-#define HydeTrackerSquare_h 1
-
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/HydeTrackerTrapezoid.hh b/NPSimulation/include/HydeTrackerTrapezoid.hh
index 63d7a2eb3f3eea82b04a32208edd2e8fb7cc804c..d1a833c97b7c718063888b8bb6776160bdf531bc 100644
--- a/NPSimulation/include/HydeTrackerTrapezoid.hh
+++ b/NPSimulation/include/HydeTrackerTrapezoid.hh
@@ -1,5 +1,7 @@
+#ifndef HydeTrackerTrapezoid_h
+#define HydeTrackerTrapezoid_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef HydeTrackerTrapezoid_h
-#define HydeTrackerTrapezoid_h 1
+
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/MUST2Array.hh b/NPSimulation/include/MUST2Array.hh
index f6def05976b46af8ab393f4725b00841ab11f92e..11b1868ca05134226b083e6b9840b80301873ccb 100644
--- a/NPSimulation/include/MUST2Array.hh
+++ b/NPSimulation/include/MUST2Array.hh
@@ -1,7 +1,7 @@
#ifndef MUST2Array_h
#define MUST2Array_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/Must2Scorers.hh b/NPSimulation/include/Must2Scorers.hh
index 18413b3a881cdec34f5c8ed1854c16128c69f523..46fb11198c0d49e149e1926609424aeeb4de1e8a 100644
--- a/NPSimulation/include/Must2Scorers.hh
+++ b/NPSimulation/include/Must2Scorers.hh
@@ -1,7 +1,7 @@
#ifndef Must2Scorers_h
#define Must2Scorers_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/Paris.hh b/NPSimulation/include/Paris.hh
index a4aa371ac553490b7ad9fcf89b94f50b61d4f72b..956f47ccadbf3cd8e1f3e0f1e36631ee600c59ad 100644
--- a/NPSimulation/include/Paris.hh
+++ b/NPSimulation/include/Paris.hh
@@ -1,5 +1,7 @@
+#ifndef Paris_h
+#define Paris_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -20,8 +22,7 @@
* *
*****************************************************************************/
-#ifndef Paris_h
-#define Paris_h 1
+
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/ParisCluster.hh b/NPSimulation/include/ParisCluster.hh
index 5b9e497adef65f791d7f49fe4a41bb3d932aa735..e5c9f8797e4d6107178d9e0a3a7e07335677a7f9 100644
--- a/NPSimulation/include/ParisCluster.hh
+++ b/NPSimulation/include/ParisCluster.hh
@@ -1,5 +1,7 @@
+#ifndef ParisCluster_h
+#define ParisCluster_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef ParisCluster_h
-#define ParisCluster_h 1
+
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/ParisModule.hh b/NPSimulation/include/ParisModule.hh
index bdaca9670698d6cd1f4a4d5841f253180fe8023d..3cf779b4c3feaa8008c6636a834bd9b64b1fc939 100644
--- a/NPSimulation/include/ParisModule.hh
+++ b/NPSimulation/include/ParisModule.hh
@@ -1,5 +1,8 @@
+#ifndef ParisModule_h
+#define ParisModule_h 1
+
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +22,6 @@
* *
*****************************************************************************/
-#ifndef ParisModule_h
-#define ParisModule_h 1
// C++ headers
#include <string>
diff --git a/NPSimulation/include/ParisPhoswich.hh b/NPSimulation/include/ParisPhoswich.hh
index 68a86c41d7c2925af4f42fd2ad0fac534c3b8113..36da6f1d385ff9adb2f09df78952b81ce9d6fa00 100644
--- a/NPSimulation/include/ParisPhoswich.hh
+++ b/NPSimulation/include/ParisPhoswich.hh
@@ -1,5 +1,7 @@
+#ifndef ParisPhoswich_h
+#define ParisPhoswich_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef ParisPhoswich_h
-#define ParisPhoswich_h 1
+
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/ParisScorers.hh b/NPSimulation/include/ParisScorers.hh
index 9ed0bd205b99e37b66e0ac7a5262eb325dc11595..1b5fa31f5c1e00065c78d691a99bbaddf3798c34 100644
--- a/NPSimulation/include/ParisScorers.hh
+++ b/NPSimulation/include/ParisScorers.hh
@@ -1,5 +1,7 @@
+#ifndef PARISScorer_h
+#define PARISScorer_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef PARISScorer_h
-#define PARISScorer_h 1
+
#include "G4VPrimitiveScorer.hh"
#include "G4THitsMap.hh"
diff --git a/NPSimulation/include/Particle.hh b/NPSimulation/include/Particle.hh
index d3eef1924564d7a8edfe66b041221f0e7982dadc..1fdb3c45f016b3d8534f065ac674397182cee415 100644
--- a/NPSimulation/include/Particle.hh
+++ b/NPSimulation/include/Particle.hh
@@ -1,7 +1,7 @@
#ifndef __PARTICLE__
#define __PARTICLE__
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/ParticleStack.hh b/NPSimulation/include/ParticleStack.hh
index b76cdba5bfa6d31e2fccda1e245ad05169663d3d..e58d3907398d806ef5ded52c5ca6f1356796d68b 100644
--- a/NPSimulation/include/ParticleStack.hh
+++ b/NPSimulation/include/ParticleStack.hh
@@ -1,7 +1,7 @@
#ifndef __PARTICLESTACK__
#define __PARTICLESTACK__
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/PhysicsList.hh b/NPSimulation/include/PhysicsList.hh
index 9c8e3b55d398b21a7cddfc6879d3fcf3f497b20f..47f37522f40de3e5439fee8d0f863b1ab1086aa4 100644
--- a/NPSimulation/include/PhysicsList.hh
+++ b/NPSimulation/include/PhysicsList.hh
@@ -1,7 +1,7 @@
#ifndef PhysicsList_h
#define PhysicsList_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/Plastic.hh b/NPSimulation/include/Plastic.hh
index 85ec1739cb0d93dbaed91c2178aa0adf4c5ded00..78a6b3436d98614c84cd4d0f6db9132a5082546b 100644
--- a/NPSimulation/include/Plastic.hh
+++ b/NPSimulation/include/Plastic.hh
@@ -1,7 +1,7 @@
#ifndef Plastic_h
#define Plastic_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/PrimaryGeneratorAction.hh b/NPSimulation/include/PrimaryGeneratorAction.hh
index 0313fa172a25817b95957740f1ef44947df1a0e7..478d60ef98d117d5eb12d844f78cc92017c5b113 100644
--- a/NPSimulation/include/PrimaryGeneratorAction.hh
+++ b/NPSimulation/include/PrimaryGeneratorAction.hh
@@ -1,7 +1,7 @@
#ifndef PrimaryGeneratorAction_h
#define PrimaryGeneratorAction_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/Sharc.hh b/NPSimulation/include/Sharc.hh
index f56d1a71e9d0e33d1f72484b80ded6726edb97c6..eb33b75507ab96aa6b7a4a8024d4c1adf5603fba 100644
--- a/NPSimulation/include/Sharc.hh
+++ b/NPSimulation/include/Sharc.hh
@@ -1,7 +1,7 @@
#ifndef Sharc_h
#define Sharc_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/SharcScorers.hh b/NPSimulation/include/SharcScorers.hh
index 95225f5ef2f433ae1d6f4ab0255917dd7be4299b..6bae9a21d304a677e3c6abefefc0adce5a2c25b7 100644
--- a/NPSimulation/include/SharcScorers.hh
+++ b/NPSimulation/include/SharcScorers.hh
@@ -1,7 +1,7 @@
#ifndef SharcScorers_h
#define SharcScorers_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/Shield.hh b/NPSimulation/include/Shield.hh
index fd69966765187eff941a7a031db8eebc59ad42c3..b60a2757868a1971c88e1bde92c800523be80bc3 100644
--- a/NPSimulation/include/Shield.hh
+++ b/NPSimulation/include/Shield.hh
@@ -1,5 +1,7 @@
+#ifndef Shield_h
+#define Shield_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -20,8 +22,7 @@
* *
*****************************************************************************/
-#ifndef Shield_h
-#define Shield_h 1
+
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/ShieldClParis.hh b/NPSimulation/include/ShieldClParis.hh
index c0d489dcff75595b7fc70ac909c249ce88e979db..c0260d423720100f6f0ad68501f1f5a4c5b0fc81 100644
--- a/NPSimulation/include/ShieldClParis.hh
+++ b/NPSimulation/include/ShieldClParis.hh
@@ -1,5 +1,7 @@
+#ifndef ShieldClParis_h
+#define ShieldClParis_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -20,8 +22,7 @@
* *
*****************************************************************************/
-#ifndef ShieldClParis_h
-#define ShieldClParis_h 1
+
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/ShieldModule.hh b/NPSimulation/include/ShieldModule.hh
index cd0ff65d8ac69f40ee16a26409c4136728cbb0bb..1499880cd8035513a25b3e42005ad1655b53e34b 100644
--- a/NPSimulation/include/ShieldModule.hh
+++ b/NPSimulation/include/ShieldModule.hh
@@ -1,5 +1,7 @@
+#ifndef ShieldModule_h
+#define ShieldModule_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef ShieldModule_h
-#define ShieldModule_h 1
+
// C++ headers
#include <string>
diff --git a/NPSimulation/include/ShieldPhParis.hh b/NPSimulation/include/ShieldPhParis.hh
index 3dc7e800afa67f3694bcb618102d0abab8edd21b..b791dce8906794148f0fca41e240a9dae53b3973 100644
--- a/NPSimulation/include/ShieldPhParis.hh
+++ b/NPSimulation/include/ShieldPhParis.hh
@@ -1,5 +1,7 @@
+#ifndef ShieldPhParis_h
+#define ShieldPhParis_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef ShieldPhParis_h
-#define ShieldPhParis_h 1
+
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/ShieldScorers.hh b/NPSimulation/include/ShieldScorers.hh
index b61153fa1f84c67fc18574896125a46ee5ea8062..67530832ef02c348a47e14017a959c30bca98054 100644
--- a/NPSimulation/include/ShieldScorers.hh
+++ b/NPSimulation/include/ShieldScorers.hh
@@ -1,5 +1,7 @@
+#ifndef SHIELDScorer_h
+#define SHIELDScorer_h 1
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef SHIELDScorer_h
-#define SHIELDScorer_h 1
+
#include "G4VPrimitiveScorer.hh"
#include "G4THitsMap.hh"
diff --git a/NPSimulation/include/SteppingVerbose.hh b/NPSimulation/include/SteppingVerbose.hh
index fc8ec37052dc529edb38ef0a50b8e61a4a29081f..fcb64c25e974f3d59273ef29fe543a5a229b5677 100644
--- a/NPSimulation/include/SteppingVerbose.hh
+++ b/NPSimulation/include/SteppingVerbose.hh
@@ -1,5 +1,7 @@
+#ifndef SteppingVerbose_h
+#define SteppingVerbose_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -18,8 +20,7 @@
* Comment: *
* *
*****************************************************************************/
-#ifndef SteppingVerbose_h
-#define SteppingVerbose_h 1
+
#include "G4SteppingVerbose.hh"
diff --git a/NPSimulation/include/Target.hh b/NPSimulation/include/Target.hh
index 47f0f893c38833947fbeab4ec26c3b5351cb2b1e..0348a77ec23a9956c4f4760af22a174af33dd5d4 100644
--- a/NPSimulation/include/Target.hh
+++ b/NPSimulation/include/Target.hh
@@ -1,7 +1,7 @@
#ifndef Target2Array_h
#define Target2Array_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/ThinSi.hh b/NPSimulation/include/ThinSi.hh
index 7d96c6020951b391776522f5cdf2e35a0c19a300..df28fda410ef3e342c2e35f65f252b8fa9740ecd 100644
--- a/NPSimulation/include/ThinSi.hh
+++ b/NPSimulation/include/ThinSi.hh
@@ -1,7 +1,7 @@
#ifndef ThinSi_h
#define ThinSi_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/ThinSiScorers.hh b/NPSimulation/include/ThinSiScorers.hh
index 33563f2026d9173af4bb56181f35e615eef79ed8..61e348a19315f2973fac2dbb971e3ef353f32eb7 100644
--- a/NPSimulation/include/ThinSiScorers.hh
+++ b/NPSimulation/include/ThinSiScorers.hh
@@ -1,7 +1,7 @@
#ifndef ThinSiScorers_h
#define ThinSiScorers_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/VDetector.hh b/NPSimulation/include/VDetector.hh
index c5a5a12f0ccbedf973a767baade259169c5dbdbb..a5ff1c7e19e81149b5e566eb94ac6ba5ba4c828e 100644
--- a/NPSimulation/include/VDetector.hh
+++ b/NPSimulation/include/VDetector.hh
@@ -1,7 +1,7 @@
#ifndef VDectector_H
#define VDectector_H
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/VEventGenerator.hh b/NPSimulation/include/VEventGenerator.hh
index 5f8f326434e91094da2cbcc196e39d8765add771..5ec0e75407dadfb44ae4315ea8aa77029b5fcf9f 100644
--- a/NPSimulation/include/VEventGenerator.hh
+++ b/NPSimulation/include/VEventGenerator.hh
@@ -1,7 +1,7 @@
#ifndef VEventGenerator_h
#define VEventGenerator_h
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/include/W1.hh b/NPSimulation/include/W1.hh
index af8fe7f0d2f7c247f7721ba22fc20aaedd66dc88..95d03e94851c448d093602bd72fdeae4192fbc63 100644
--- a/NPSimulation/include/W1.hh
+++ b/NPSimulation/include/W1.hh
@@ -1,5 +1,7 @@
+#ifndef W1_h
+#define W1_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,8 +21,7 @@
* *
*****************************************************************************/
-#ifndef W1_h
-#define W1_h 1
+
// C++ headers
#include <vector>
diff --git a/NPSimulation/include/W1Scorers.hh b/NPSimulation/include/W1Scorers.hh
index e5fb885c9c0e03aa433009b91157218459dd6aa5..8e222fa82dd690eff7f09eef271f2f5c6415b47b 100644
--- a/NPSimulation/include/W1Scorers.hh
+++ b/NPSimulation/include/W1Scorers.hh
@@ -1,5 +1,7 @@
+#ifndef W1Scorer_h
+#define W1Scorer_h 1
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
@@ -19,9 +21,6 @@
* *
*****************************************************************************/
-#ifndef W1Scorer_h
-#define W1Scorer_h 1
-
#include "G4VPrimitiveScorer.hh"
#include "G4THitsMap.hh"
diff --git a/NPSimulation/src/AnnularS1.cc b/NPSimulation/src/AnnularS1.cc
index 8438bba6e2137b105467a61f95dd011d4bb99ad5..6d572feb097e577cf52a3f178f450f217c0d9fcb 100644
--- a/NPSimulation/src/AnnularS1.cc
+++ b/NPSimulation/src/AnnularS1.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/AnnularS1Scorers.cc b/NPSimulation/src/AnnularS1Scorers.cc
index aaa7192c9dcbe1932b36f706aebd4b5731aae8f4..04ef13933a13fdda80d4cb00fd5ad2915e233a6e 100644
--- a/NPSimulation/src/AnnularS1Scorers.cc
+++ b/NPSimulation/src/AnnularS1Scorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/Chamber.cc b/NPSimulation/src/Chamber.cc
index e0a61bb1d2f42a8b69f4beb1ffb1285884047423..a56bb3f43de87139c634ceeac7ce88c92feaac5d 100644
--- a/NPSimulation/src/Chamber.cc
+++ b/NPSimulation/src/Chamber.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ComptonTelescope.cc b/NPSimulation/src/ComptonTelescope.cc
index a7539bcadce4f465c9f6a6cbd9d98c900e119668..d8df3f991aacb84cd73226703f955c6238b365b2 100755
--- a/NPSimulation/src/ComptonTelescope.cc
+++ b/NPSimulation/src/ComptonTelescope.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ComptonTelescopeScorers.cc b/NPSimulation/src/ComptonTelescopeScorers.cc
index 12e8817e610b2bf31d5ddd5055178ecef1ff45a2..eadf77408157f98005450b9ea08965b06f1645e4 100755
--- a/NPSimulation/src/ComptonTelescopeScorers.cc
+++ b/NPSimulation/src/ComptonTelescopeScorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/DetectorConstruction.cc b/NPSimulation/src/DetectorConstruction.cc
index dd1c297a6b1b95e0abaca6a2529aba257ca894a0..3993aed59c29ea7c0860f2cab7be2934c914d105 100644
--- a/NPSimulation/src/DetectorConstruction.cc
+++ b/NPSimulation/src/DetectorConstruction.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/DummyDetector.cc b/NPSimulation/src/DummyDetector.cc
index ada0b0e2f9275b2cddcad5d79ed63e7a0437e6c5..9346d36b2d917956ce3be269fb61231d38c2fd5b 100644
--- a/NPSimulation/src/DummyDetector.cc
+++ b/NPSimulation/src/DummyDetector.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/Eurogam.cc b/NPSimulation/src/Eurogam.cc
index d9d2c9ed4fa682de3e77ab986370e73d6a489444..2bb690f999cf7dab7735218176e4b6475c9be81b 100755
--- a/NPSimulation/src/Eurogam.cc
+++ b/NPSimulation/src/Eurogam.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/EventAction.cc b/NPSimulation/src/EventAction.cc
index 45dec873533afdc6dc9312b185d127d7211715c1..45322725f87bfb605014f9a304274a3cae7d399f 100644
--- a/NPSimulation/src/EventAction.cc
+++ b/NPSimulation/src/EventAction.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/EventGeneratorBeam.cc b/NPSimulation/src/EventGeneratorBeam.cc
index 39be201dbbae6e4acd8413eb1a0463b54f3d4814..3867bbe163203f90604045e27600455ff5d3334b 100644
--- a/NPSimulation/src/EventGeneratorBeam.cc
+++ b/NPSimulation/src/EventGeneratorBeam.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/EventGeneratorGammaDecay.cc b/NPSimulation/src/EventGeneratorGammaDecay.cc
index 81fe995f606c7795ff88ea0f18694716199f5224..9b5b8742fb97614a69beb547e5090c108e4e478d 100644
--- a/NPSimulation/src/EventGeneratorGammaDecay.cc
+++ b/NPSimulation/src/EventGeneratorGammaDecay.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/EventGeneratorIsotropic.cc b/NPSimulation/src/EventGeneratorIsotropic.cc
index e4a3d39f3f16f34ff024779430a954d760a95586..8584384c6fc11a09038c1752950805a26eba7358 100644
--- a/NPSimulation/src/EventGeneratorIsotropic.cc
+++ b/NPSimulation/src/EventGeneratorIsotropic.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/EventGeneratorParticleDecay.cc b/NPSimulation/src/EventGeneratorParticleDecay.cc
index e50b250d1c0fd87b93ed8de55e5be55b9fa62980..9c31da6512ed07cf73fce0eb18dbe1d2cdd4c88f 100644
--- a/NPSimulation/src/EventGeneratorParticleDecay.cc
+++ b/NPSimulation/src/EventGeneratorParticleDecay.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/EventGeneratorTwoBodyReaction.cc b/NPSimulation/src/EventGeneratorTwoBodyReaction.cc
index 2136cc88f80ecb94d7b860937a704a1dad3cff8f..3e048c743a2eba299be6afa15353cc4603f4201c 100644
--- a/NPSimulation/src/EventGeneratorTwoBodyReaction.cc
+++ b/NPSimulation/src/EventGeneratorTwoBodyReaction.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/GaspardScorers.cc b/NPSimulation/src/GaspardScorers.cc
index 16a2b52877f7d1535d19b6f7799e806be7ad4a3d..83bf734b86afee9826d756eb18cb7faafa83f89c 100644
--- a/NPSimulation/src/GaspardScorers.cc
+++ b/NPSimulation/src/GaspardScorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/GaspardTracker.cc b/NPSimulation/src/GaspardTracker.cc
index bd377f355efba4bfea1b508ac7aecfe954b2ec60..3130225d0df25ff77d5e19fa35206cd3672b5282 100644
--- a/NPSimulation/src/GaspardTracker.cc
+++ b/NPSimulation/src/GaspardTracker.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/GaspardTrackerAnnular.cc b/NPSimulation/src/GaspardTrackerAnnular.cc
index fce7062f128579ad6562771a371ea74fa614a33a..b9873ceaa20c45df2aeef29d3a00d1d3bfe6e150 100644
--- a/NPSimulation/src/GaspardTrackerAnnular.cc
+++ b/NPSimulation/src/GaspardTrackerAnnular.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/GaspardTrackerDummyShape.cc b/NPSimulation/src/GaspardTrackerDummyShape.cc
index 22cf70dfdf8de3603a5dbe085e08d3eae1d18a1c..1be4accdf22aa178f30aff3196df15498832738d 100644
--- a/NPSimulation/src/GaspardTrackerDummyShape.cc
+++ b/NPSimulation/src/GaspardTrackerDummyShape.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/GaspardTrackerModule.cc b/NPSimulation/src/GaspardTrackerModule.cc
index 4fb280990d0bfcaae6913815f275046705972902..4687665febf18c752e07ce2a1ca54fb66f750855 100644
--- a/NPSimulation/src/GaspardTrackerModule.cc
+++ b/NPSimulation/src/GaspardTrackerModule.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/GaspardTrackerSquare.cc b/NPSimulation/src/GaspardTrackerSquare.cc
index e53923e0a13588cc5bdb80e955c6877be1b92fc4..3f0b13412541061fbec644380f747529e58e7298 100644
--- a/NPSimulation/src/GaspardTrackerSquare.cc
+++ b/NPSimulation/src/GaspardTrackerSquare.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/GaspardTrackerTrapezoid.cc b/NPSimulation/src/GaspardTrackerTrapezoid.cc
index b0beab40b50408669a6104c907ef497686c59e46..5094093f435ee1b7a1581a452af1d8c1b96778c9 100644
--- a/NPSimulation/src/GaspardTrackerTrapezoid.cc
+++ b/NPSimulation/src/GaspardTrackerTrapezoid.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/GeneralScorers.cc b/NPSimulation/src/GeneralScorers.cc
index 57a4c74f0dedabc1029797e8c9804566e97f26df..2c8b404214b1ce639a7891237b02aacd8dbb722a 100644
--- a/NPSimulation/src/GeneralScorers.cc
+++ b/NPSimulation/src/GeneralScorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/HydeScorers.cc b/NPSimulation/src/HydeScorers.cc
index d75809cb9d521373a93699aa937fe12c09c77cd3..59409ac255a7b3f0118f6ca39afe4de56420f127 100644
--- a/NPSimulation/src/HydeScorers.cc
+++ b/NPSimulation/src/HydeScorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/HydeTracker.cc b/NPSimulation/src/HydeTracker.cc
index 8c83646cdbf8a4fb5f3508dbf75d5dde8edcd02e..6d5599773cd427258af15007c46fa99b3d96039b 100644
--- a/NPSimulation/src/HydeTracker.cc
+++ b/NPSimulation/src/HydeTracker.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/HydeTrackerAnnular.cc b/NPSimulation/src/HydeTrackerAnnular.cc
index 6982d34398baaf21d5ebcc1f7380db22a3aba545..b5902dd7f7d404e3aec6e8c4ffe01bc14e440ab4 100644
--- a/NPSimulation/src/HydeTrackerAnnular.cc
+++ b/NPSimulation/src/HydeTrackerAnnular.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/HydeTrackerDummyShape.cc b/NPSimulation/src/HydeTrackerDummyShape.cc
index 23053cd9506056648b5341a0818fcb411e6d386d..965c3b25fab1ee9e1e98d9817139148c9dc28b01 100644
--- a/NPSimulation/src/HydeTrackerDummyShape.cc
+++ b/NPSimulation/src/HydeTrackerDummyShape.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/HydeTrackerModule.cc b/NPSimulation/src/HydeTrackerModule.cc
index 9ddf93f440fe8d85fe91aaa6e957316ef875548d..a2d20980dcb6bbae17cafef570512241e9fd3800 100644
--- a/NPSimulation/src/HydeTrackerModule.cc
+++ b/NPSimulation/src/HydeTrackerModule.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/HydeTrackerSquare.cc b/NPSimulation/src/HydeTrackerSquare.cc
index a544b1065acc67d947f40daa303705902ecb281e..500296145674b01c86df7f289602760f62533ea0 100644
--- a/NPSimulation/src/HydeTrackerSquare.cc
+++ b/NPSimulation/src/HydeTrackerSquare.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/HydeTrackerTrapezoid.cc b/NPSimulation/src/HydeTrackerTrapezoid.cc
index 6f2bb950da871117b45e472bafad06e770d474ed..4252bfcd94eabbd583c2996892720e79af2b87db 100644
--- a/NPSimulation/src/HydeTrackerTrapezoid.cc
+++ b/NPSimulation/src/HydeTrackerTrapezoid.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/MUST2Array.cc b/NPSimulation/src/MUST2Array.cc
index 1b39c9db67ec9697fe6baec974f76ff30f62d117..48252f18927f6fd65291e0614f59336821f760b8 100644
--- a/NPSimulation/src/MUST2Array.cc
+++ b/NPSimulation/src/MUST2Array.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/Must2Scorers.cc b/NPSimulation/src/Must2Scorers.cc
index b94747015facd4e09db94450831ef95148ce1119..06601b2cbe1f3f4295f1e2b23b4e8488e407d715 100644
--- a/NPSimulation/src/Must2Scorers.cc
+++ b/NPSimulation/src/Must2Scorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/Paris.cc b/NPSimulation/src/Paris.cc
index 649b85395903ca8403d96d681a524bafbacde102..450b582de34b67f6607e8d8615149e1a8a139453 100644
--- a/NPSimulation/src/Paris.cc
+++ b/NPSimulation/src/Paris.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ParisCluster.cc b/NPSimulation/src/ParisCluster.cc
index df56f1e006bea64ce88f6a76e8352abe37c967bc..2ee93847de8b42b7fd209d4af4a5b8a8900de89d 100644
--- a/NPSimulation/src/ParisCluster.cc
+++ b/NPSimulation/src/ParisCluster.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ParisModule.cc b/NPSimulation/src/ParisModule.cc
index a42856357dcebca19e490982bd4feb0b30b5e287..1b642c415ea4bb3495b02ec74cdde82fc91213d4 100644
--- a/NPSimulation/src/ParisModule.cc
+++ b/NPSimulation/src/ParisModule.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ParisPhoswich.cc b/NPSimulation/src/ParisPhoswich.cc
index 6bc6ce01c316a12af9ce3e8ffb96821e2d7950ae..03d95be6f4bb0a0fbff760b432cf603aa2d3ad94 100644
--- a/NPSimulation/src/ParisPhoswich.cc
+++ b/NPSimulation/src/ParisPhoswich.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ParisScorers.cc b/NPSimulation/src/ParisScorers.cc
index b21790a5b75acc272398211afcb6861306c172f0..e8a4b699aa3c18062407fbaa1f37bf59a504d8bc 100644
--- a/NPSimulation/src/ParisScorers.cc
+++ b/NPSimulation/src/ParisScorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/Particle.cc b/NPSimulation/src/Particle.cc
index 4feffe6ef2b975a4c42f5d9003d8f42d868d9376..82f1da484e923a5c96e3229458bf99ff9e01c9df 100644
--- a/NPSimulation/src/Particle.cc
+++ b/NPSimulation/src/Particle.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ParticleStack.cc b/NPSimulation/src/ParticleStack.cc
index 69c1e46227e80ebd4c45572fa7b8d65df4844246..5c4eb7617af56fc69a7cff62f2a8414d8984144f 100644
--- a/NPSimulation/src/ParticleStack.cc
+++ b/NPSimulation/src/ParticleStack.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/PhysicsList.cc b/NPSimulation/src/PhysicsList.cc
index 35ed164e77d9789fa7cca7b8719e28cfb59088c0..78975bc4e4ab4fe56507b5f5d4f11cc6a463aad3 100644
--- a/NPSimulation/src/PhysicsList.cc
+++ b/NPSimulation/src/PhysicsList.cc
@@ -1,349 +1,349 @@
-/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
- * *
- * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
- * For the list of contributors see $NPTOOL/Licence/Contributors *
- *****************************************************************************/
-
-/*****************************************************************************
- * Original Author: Adrien MATTA contact address: matta@ipno.in2p3.fr *
- * *
- * Creation Date : January 2009 *
- * Last update : *
- *---------------------------------------------------------------------------*
- * Decription: *
- * A quite standard, non-modulable Geant4 PPhysicis list. *
- * Well suited for low energy ions physics. *
- * *
- *---------------------------------------------------------------------------*
- * Comment: *
- * A good improvement should be a modular physicis list in order to deal *
- * accuratly with different physics cases. *
- *****************************************************************************/
- #include "PhysicsList.hh"
-
-// I/O
-#include "G4ios.hh"
-#include <iomanip>
-
-//Particle Definition
-#include "G4ParticleTypes.hh"
-#include "G4IonConstructor.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleTable.hh"
-
-
-//Process
-#include "G4Transportation.hh"
-
-// Standard Geant4
-#include "G4ComptonScattering.hh"
-#include "G4GammaConversion.hh"
-#include "G4PhotoElectricEffect.hh"
-#include "G4eMultipleScattering.hh"
-#include "G4eIonisation.hh"
-#include "G4eBremsstrahlung.hh"
-#include "G4eplusAnnihilation.hh"
-
-// Penelope
-//#include "G4PenelopeIonisation.hh"
-//#include "G4PenelopeBremsstrahlung.hh"
-//#include "G4PenelopeAnnihilation.hh"
-
-//#include "G4PenelopeCompton.hh"
-//#include "G4PenelopeGammaConversion.hh"
-//#include "G4PenelopePhotoElectric.hh"
-//#include "G4PenelopeRayleigh.hh"
-
-// Low energy ~ Penelope
-//#include "G4LowEnergyIonisation.hh"
-//#include "G4LowEnergyBremsstrahlung.hh"
-
-//#include "G4LowEnergyCompton.hh"
-//#include "G4LowEnergyGammaConversion.hh"
-//#include "G4LowEnergyPhotoElectric.hh"
-//#include "G4LowEnergyRayleigh.hh"
-
-
-#include "G4MuIonisation.hh"
-#include "G4MuMultipleScattering.hh"
-#include "G4MuBremsstrahlung.hh"
-#include "G4MuPairProduction.hh"
-
-#include "G4hIonisation.hh"
-#include "G4ionIonisation.hh"
-#include "G4hMultipleScattering.hh"
-//#include "G4hLowEnergyIonisation.hh"
-
-#include "G4EmProcessOptions.hh"
-#include "G4ProcessManager.hh"
-#include "G4ProcessVector.hh"
-
-// Cut
-#include "G4ParticleWithCuts.hh"
-#include "G4UserSpecialCuts.hh"
-
-// Decay
-#include "G4Decay.hh"
-#include "G4DecayTable.hh"
-#include "G4VDecayChannel.hh"
-#include "G4NuclearDecayChannel.hh"
-#include "G4BetaMinusDecayChannel.hh"
-
-
-//#include "G4Gamma.hh"
-//#include "G4Electron.hh"
-//#include "G4Positron.hh"
-
-
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-PhysicsList::PhysicsList()
-{
- // ie: no secondaries
- defaultCutValue = 1000 * pc;
-}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-PhysicsList::~PhysicsList()
-{
- ;
-}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void PhysicsList::ConstructParticle()
-{
- // In this method, static member functions should be called
- // for all particles which you want to use.
- // This ensures that objects of these particle types will be
- // created in the program.
-
- //Usefull to test geometry
- G4Geantino::GeantinoDefinition();
-
- //Usefull for Gamma
- ConstructBosons();
-
- //Usefull for betaDecay
- ConstructLeptons();
-
- //Needed by G4 (4.9.2) to run on mac os X ;-)
- ConstructMesons();
-
- //usefull for p and n
- ConstructBaryons();
-
- //Usefull of course :p
- ConstructIons();
-}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void PhysicsList::ConstructBosons()
-{
- G4Geantino::GeantinoDefinition() ;
- G4ChargedGeantino::ChargedGeantinoDefinition() ;
- G4Gamma::GammaDefinition() ;
-}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void PhysicsList::ConstructLeptons()
-{
- G4Electron::ElectronDefinition() ;
- G4Positron::PositronDefinition() ;
- G4NeutrinoE::NeutrinoEDefinition() ;
- G4AntiNeutrinoE::AntiNeutrinoEDefinition() ;
- //G4NeutrinoMu::NeutrinoMuDefinition() ;
- //G4AntiNeutrinoMu::AntiNeutrinoMuDefinition() ;
- //G4MuonPlus::MuonPlusDefinition() ;
- //G4MuonMinus::MuonMinusDefinition() ;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void PhysicsList::ConstructBaryons()
-{
- G4Proton::ProtonDefinition() ;
- G4AntiProton::AntiProtonDefinition() ;
- G4Neutron::NeutronDefinition();
-}
-
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void PhysicsList::ConstructMesons()
-{
- // mesons
- G4PionPlus ::PionPlusDefinition();
- G4PionMinus ::PionMinusDefinition();
- G4PionZero ::PionZeroDefinition();
- G4Eta ::EtaDefinition();
- G4EtaPrime ::EtaPrimeDefinition();
- // G4RhoZero ::RhoZeroDefinition();
- G4KaonPlus ::KaonPlusDefinition();
- G4KaonMinus ::KaonMinusDefinition();
- G4KaonZero ::KaonZeroDefinition();
- G4AntiKaonZero ::AntiKaonZeroDefinition();
- G4KaonZeroLong ::KaonZeroLongDefinition();
- G4KaonZeroShort::KaonZeroShortDefinition();
-}
-
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void PhysicsList::ConstructIons()
-{
- G4He3::He3Definition() ;
- G4Deuteron::DeuteronDefinition() ;
- G4Triton::TritonDefinition() ;
- G4Alpha::AlphaDefinition() ;
-
- G4IonConstructor iConstructor ;
- iConstructor.ConstructParticle() ;
-
-}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void PhysicsList::ConstructProcess()
-{
- AddTransportation() ;
- ConstructEM() ;
-
- SetCuts() ;
-}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void PhysicsList::ConstructEM()
-{
-
- theParticleIterator->reset();
-
- while ((*theParticleIterator)()) {
- G4ParticleDefinition* particle = theParticleIterator->value() ;
- G4ProcessManager* pmanager = particle->GetProcessManager() ;
- G4String particleName = particle->GetParticleName() ;
-
- if (particleName == "gamma") {
- // gamma
- //standard Geant4
- pmanager->AddDiscreteProcess(new G4PhotoElectricEffect) ;
- pmanager->AddDiscreteProcess(new G4ComptonScattering) ;
- pmanager->AddDiscreteProcess(new G4GammaConversion) ;
- //Low energy
- //pmanager->AddDiscreteProcess(new G4LowEnergyPhotoElectric) ;
- //pmanager->AddDiscreteProcess(new G4LowEnergyCompton) ;
- //pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion) ;
- //pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh) ;
- // Penelope
- //pmanager->AddDiscreteProcess(new G4PenelopePhotoElectric) ;
- //pmanager->AddDiscreteProcess(new G4PenelopeCompton) ;
- //pmanager->AddDiscreteProcess(new G4PenelopeGammaConversion) ;
- //pmanager->AddDiscreteProcess(new G4PenelopeRayleigh) ;
-
- } else if (particleName == "e-") {
- //electron
- pmanager->AddProcess(new G4eMultipleScattering , -1, 1, 1) ;
- //standard geant4:
- pmanager->AddProcess(new G4eIonisation , -1, 2, 2) ;
- pmanager->AddProcess(new G4eBremsstrahlung , -1, -1, 3) ;
- // Low energy:
- //pmanager->AddProcess(new G4LowEnergyIonisation , -1, 2, 2) ;
- //pmanager->AddProcess(new G4LowEnergyBremsstrahlung , -1, -1, 3) ;
- // Penelope:
- // pmanager->AddProcess(new G4PenelopeIonisation , -1, 2, 2) ;
- // pmanager->AddProcess(new G4PenelopeBremsstrahlung , -1, -1, 3) ;
-
-
- } else if (particleName == "e+") {
- //positron
- pmanager->AddProcess(new G4eMultipleScattering , -1, 1, 1 );
- // standard Geant4 and Low energy
- pmanager->AddProcess(new G4eIonisation , -1, 2, 2 );
- pmanager->AddProcess(new G4eBremsstrahlung , -1, -1, 3 );
- pmanager->AddProcess(new G4eplusAnnihilation , 0, -1, 4 );
- //Penelope:
- //pmanager->AddProcess(new G4PenelopeIonisation , -1, 2, 2 );
- //pmanager->AddProcess(new G4PenelopeBremsstrahlung , -1, -1, 3 );
- //pmanager->AddProcess(new G4PenelopeAnnihilation , 0, -1, 4 );
-
-
-
- } else if (particleName == "mu+" ||
- particleName == "mu-") {
-
- //muon
- /* pmanager->AddProcess(new G4muMultipleScattering , -1, 1, 1 ) ;
- pmanager->AddProcess(new G4MuIonisation , -1, 2, 2 ) ;
- pmanager->AddProcess(new G4MuBremsstrahlung , -1, -1, 3 ) ;
- pmanager->AddProcess(new G4MuPairProduction , -1, -1, 4 ) ;*/
-
- } else if (particleName == "GenericIon") {
- pmanager->AddProcess(new G4hMultipleScattering(), -1, 1, 1) ;
- G4ionIonisation* iI = new G4ionIonisation ;
- // mod by Nicolas [07/05/09]
-// iI->ActivateNuclearStopping(true) ;
- iI->ActivateStoppingData(true) ;
- pmanager->AddProcess(iI , -1, 2, 2) ;
-
- //all others charged particles except geantino
- } else if ((!particle->IsShortLived()) &&
- (particle->GetPDGCharge() != 0.0) &&
- (particleName != "chargedgeantino")) {
-
- G4hIonisation* hI = new G4hIonisation ;
- // mod by Nicolas [07/05/09]
-// hI->ActivateNuclearStopping(true) ;
- pmanager->AddProcess(new G4hMultipleScattering , -1, 1, 1) ;
- pmanager->AddProcess(hI , -1, 2, 2) ;
-
-
- }//end else if
- }//end while particle
-
- G4EmProcessOptions opt ;
- opt.SetSubCutoff(true) ;
- opt.SetMinEnergy(0.001*eV) ;
- opt.SetMaxEnergy(1000.*MeV) ;
- opt.SetDEDXBinning(1000) ;
- opt.SetLambdaBinning(1000) ;
- // mod by Nicolas [07/05/09]
-// opt.SetLinearLossLimit(1.e-3) ;
-
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void PhysicsList::SetCuts()
-{
- // uppress error messages even in case e/gamma/proton do not exist
- G4int temp = GetVerboseLevel();
- SetVerboseLevel(0);
- // " G4VUserPhysicsList::SetCutsWithDefault" method sets
- // the default cut value for all particle types
- SetCutsWithDefault();
-
- // for gamma-rays
-// SetCutValue(0.01*mm, "gamma");
-// SetCutValue(0.01*mm, "e-");
-// SetCutValue(0.01*mm, "e+");
-
- // Retrieve verbose level
- SetVerboseLevel(temp);
-}
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void PhysicsList::ConstructDecay()
-{
-
-// Add Decay Process
- G4Decay* theDecayProcess = new G4Decay() ;
- theParticleIterator->reset() ;
- while ((*theParticleIterator)()) {
- G4ParticleDefinition* particle = theParticleIterator->value() ;
- G4ProcessManager* pmanager = particle->GetProcessManager();
- if (theDecayProcess->IsApplicable(*particle)) {
- pmanager ->AddProcess(theDecayProcess);
- // set ordering for PostStepDoIt and AtRestDoIt
- pmanager->SetProcessOrdering(theDecayProcess, idxPostStep);
- pmanager->SetProcessOrdering(theDecayProcess, idxAtRest);
- }
- }
-//end Add Decay Process
-
-}
-
-void PhysicsList::MyOwnConstruction()
-{
- ConstructDecay();
-}
-
-
-
+/*****************************************************************************
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
+ * *
+ * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
+ * For the list of contributors see $NPTOOL/Licence/Contributors *
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Original Author: Adrien MATTA contact address: matta@ipno.in2p3.fr *
+ * *
+ * Creation Date : January 2009 *
+ * Last update : *
+ *---------------------------------------------------------------------------*
+ * Decription: *
+ * A quite standard, non-modulable Geant4 PPhysicis list. *
+ * Well suited for low energy ions physics. *
+ * *
+ *---------------------------------------------------------------------------*
+ * Comment: *
+ * A good improvement should be a modular physicis list in order to deal *
+ * accuratly with different physics cases. *
+ *****************************************************************************/
+ #include "PhysicsList.hh"
+
+// I/O
+#include "G4ios.hh"
+#include <iomanip>
+
+//Particle Definition
+#include "G4ParticleTypes.hh"
+#include "G4IonConstructor.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ParticleTable.hh"
+
+
+//Process
+#include "G4Transportation.hh"
+
+// Standard Geant4
+#include "G4ComptonScattering.hh"
+#include "G4GammaConversion.hh"
+#include "G4PhotoElectricEffect.hh"
+#include "G4eMultipleScattering.hh"
+#include "G4eIonisation.hh"
+#include "G4eBremsstrahlung.hh"
+#include "G4eplusAnnihilation.hh"
+
+// Penelope
+//#include "G4PenelopeIonisation.hh"
+//#include "G4PenelopeBremsstrahlung.hh"
+//#include "G4PenelopeAnnihilation.hh"
+
+//#include "G4PenelopeCompton.hh"
+//#include "G4PenelopeGammaConversion.hh"
+//#include "G4PenelopePhotoElectric.hh"
+//#include "G4PenelopeRayleigh.hh"
+
+// Low energy ~ Penelope
+//#include "G4LowEnergyIonisation.hh"
+//#include "G4LowEnergyBremsstrahlung.hh"
+
+//#include "G4LowEnergyCompton.hh"
+//#include "G4LowEnergyGammaConversion.hh"
+//#include "G4LowEnergyPhotoElectric.hh"
+//#include "G4LowEnergyRayleigh.hh"
+
+
+#include "G4MuIonisation.hh"
+#include "G4MuMultipleScattering.hh"
+#include "G4MuBremsstrahlung.hh"
+#include "G4MuPairProduction.hh"
+
+#include "G4hIonisation.hh"
+#include "G4ionIonisation.hh"
+#include "G4hMultipleScattering.hh"
+//#include "G4hLowEnergyIonisation.hh"
+
+#include "G4EmProcessOptions.hh"
+#include "G4ProcessManager.hh"
+#include "G4ProcessVector.hh"
+
+// Cut
+#include "G4ParticleWithCuts.hh"
+#include "G4UserSpecialCuts.hh"
+
+// Decay
+#include "G4Decay.hh"
+#include "G4DecayTable.hh"
+#include "G4VDecayChannel.hh"
+#include "G4NuclearDecayChannel.hh"
+#include "G4BetaMinusDecayChannel.hh"
+
+
+//#include "G4Gamma.hh"
+//#include "G4Electron.hh"
+//#include "G4Positron.hh"
+
+
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+PhysicsList::PhysicsList()
+{
+ // ie: no secondaries
+ defaultCutValue = 1000 * pc;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+PhysicsList::~PhysicsList()
+{
+ ;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void PhysicsList::ConstructParticle()
+{
+ // In this method, static member functions should be called
+ // for all particles which you want to use.
+ // This ensures that objects of these particle types will be
+ // created in the program.
+
+ //Usefull to test geometry
+ G4Geantino::GeantinoDefinition();
+
+ //Usefull for Gamma
+ ConstructBosons();
+
+ //Usefull for betaDecay
+ ConstructLeptons();
+
+ //Needed by G4 (4.9.2) to run on mac os X ;-)
+ ConstructMesons();
+
+ //usefull for p and n
+ ConstructBaryons();
+
+ //Usefull of course :p
+ ConstructIons();
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void PhysicsList::ConstructBosons()
+{
+ G4Geantino::GeantinoDefinition() ;
+ G4ChargedGeantino::ChargedGeantinoDefinition() ;
+ G4Gamma::GammaDefinition() ;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void PhysicsList::ConstructLeptons()
+{
+ G4Electron::ElectronDefinition() ;
+ G4Positron::PositronDefinition() ;
+ G4NeutrinoE::NeutrinoEDefinition() ;
+ G4AntiNeutrinoE::AntiNeutrinoEDefinition() ;
+ //G4NeutrinoMu::NeutrinoMuDefinition() ;
+ //G4AntiNeutrinoMu::AntiNeutrinoMuDefinition() ;
+ //G4MuonPlus::MuonPlusDefinition() ;
+ //G4MuonMinus::MuonMinusDefinition() ;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void PhysicsList::ConstructBaryons()
+{
+ G4Proton::ProtonDefinition() ;
+ G4AntiProton::AntiProtonDefinition() ;
+ G4Neutron::NeutronDefinition();
+}
+
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void PhysicsList::ConstructMesons()
+{
+ // mesons
+ G4PionPlus ::PionPlusDefinition();
+ G4PionMinus ::PionMinusDefinition();
+ G4PionZero ::PionZeroDefinition();
+ G4Eta ::EtaDefinition();
+ G4EtaPrime ::EtaPrimeDefinition();
+ // G4RhoZero ::RhoZeroDefinition();
+ G4KaonPlus ::KaonPlusDefinition();
+ G4KaonMinus ::KaonMinusDefinition();
+ G4KaonZero ::KaonZeroDefinition();
+ G4AntiKaonZero ::AntiKaonZeroDefinition();
+ G4KaonZeroLong ::KaonZeroLongDefinition();
+ G4KaonZeroShort::KaonZeroShortDefinition();
+}
+
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void PhysicsList::ConstructIons()
+{
+ G4He3::He3Definition() ;
+ G4Deuteron::DeuteronDefinition() ;
+ G4Triton::TritonDefinition() ;
+ G4Alpha::AlphaDefinition() ;
+
+ G4IonConstructor iConstructor ;
+ iConstructor.ConstructParticle() ;
+
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void PhysicsList::ConstructProcess()
+{
+ AddTransportation() ;
+ ConstructEM() ;
+
+ SetCuts() ;
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void PhysicsList::ConstructEM()
+{
+
+ theParticleIterator->reset();
+
+ while ((*theParticleIterator)()) {
+ G4ParticleDefinition* particle = theParticleIterator->value() ;
+ G4ProcessManager* pmanager = particle->GetProcessManager() ;
+ G4String particleName = particle->GetParticleName() ;
+
+ if (particleName == "gamma") {
+ // gamma
+ //standard Geant4
+ pmanager->AddDiscreteProcess(new G4PhotoElectricEffect) ;
+ pmanager->AddDiscreteProcess(new G4ComptonScattering) ;
+ pmanager->AddDiscreteProcess(new G4GammaConversion) ;
+ //Low energy
+ //pmanager->AddDiscreteProcess(new G4LowEnergyPhotoElectric) ;
+ //pmanager->AddDiscreteProcess(new G4LowEnergyCompton) ;
+ //pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion) ;
+ //pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh) ;
+ // Penelope
+ //pmanager->AddDiscreteProcess(new G4PenelopePhotoElectric) ;
+ //pmanager->AddDiscreteProcess(new G4PenelopeCompton) ;
+ //pmanager->AddDiscreteProcess(new G4PenelopeGammaConversion) ;
+ //pmanager->AddDiscreteProcess(new G4PenelopeRayleigh) ;
+
+ } else if (particleName == "e-") {
+ //electron
+ pmanager->AddProcess(new G4eMultipleScattering , -1, 1, 1) ;
+ //standard geant4:
+ pmanager->AddProcess(new G4eIonisation , -1, 2, 2) ;
+ pmanager->AddProcess(new G4eBremsstrahlung , -1, -1, 3) ;
+ // Low energy:
+ //pmanager->AddProcess(new G4LowEnergyIonisation , -1, 2, 2) ;
+ //pmanager->AddProcess(new G4LowEnergyBremsstrahlung , -1, -1, 3) ;
+ // Penelope:
+ // pmanager->AddProcess(new G4PenelopeIonisation , -1, 2, 2) ;
+ // pmanager->AddProcess(new G4PenelopeBremsstrahlung , -1, -1, 3) ;
+
+
+ } else if (particleName == "e+") {
+ //positron
+ pmanager->AddProcess(new G4eMultipleScattering , -1, 1, 1 );
+ // standard Geant4 and Low energy
+ pmanager->AddProcess(new G4eIonisation , -1, 2, 2 );
+ pmanager->AddProcess(new G4eBremsstrahlung , -1, -1, 3 );
+ pmanager->AddProcess(new G4eplusAnnihilation , 0, -1, 4 );
+ //Penelope:
+ //pmanager->AddProcess(new G4PenelopeIonisation , -1, 2, 2 );
+ //pmanager->AddProcess(new G4PenelopeBremsstrahlung , -1, -1, 3 );
+ //pmanager->AddProcess(new G4PenelopeAnnihilation , 0, -1, 4 );
+
+
+
+ } else if (particleName == "mu+" ||
+ particleName == "mu-") {
+
+ //muon
+ /* pmanager->AddProcess(new G4muMultipleScattering , -1, 1, 1 ) ;
+ pmanager->AddProcess(new G4MuIonisation , -1, 2, 2 ) ;
+ pmanager->AddProcess(new G4MuBremsstrahlung , -1, -1, 3 ) ;
+ pmanager->AddProcess(new G4MuPairProduction , -1, -1, 4 ) ;*/
+
+ } else if (particleName == "GenericIon") {
+ pmanager->AddProcess(new G4hMultipleScattering(), -1, 1, 1) ;
+ G4ionIonisation* iI = new G4ionIonisation ;
+ // mod by Nicolas [07/05/09]
+// iI->ActivateNuclearStopping(true) ;
+ iI->ActivateStoppingData(true) ;
+ pmanager->AddProcess(iI , -1, 2, 2) ;
+
+ //all others charged particles except geantino
+ } else if ((!particle->IsShortLived()) &&
+ (particle->GetPDGCharge() != 0.0) &&
+ (particleName != "chargedgeantino")) {
+
+ G4hIonisation* hI = new G4hIonisation ;
+ // mod by Nicolas [07/05/09]
+// hI->ActivateNuclearStopping(true) ;
+ pmanager->AddProcess(new G4hMultipleScattering , -1, 1, 1) ;
+ pmanager->AddProcess(hI , -1, 2, 2) ;
+
+
+ }//end else if
+ }//end while particle
+
+ G4EmProcessOptions opt ;
+ opt.SetSubCutoff(true) ;
+ opt.SetMinEnergy(0.001*eV) ;
+ opt.SetMaxEnergy(1000.*MeV) ;
+ opt.SetDEDXBinning(1000) ;
+ opt.SetLambdaBinning(1000) ;
+ // mod by Nicolas [07/05/09]
+// opt.SetLinearLossLimit(1.e-3) ;
+
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void PhysicsList::SetCuts()
+{
+ // uppress error messages even in case e/gamma/proton do not exist
+ G4int temp = GetVerboseLevel();
+ SetVerboseLevel(0);
+ // " G4VUserPhysicsList::SetCutsWithDefault" method sets
+ // the default cut value for all particle types
+ SetCutsWithDefault();
+
+ // for gamma-rays
+// SetCutValue(0.01*mm, "gamma");
+// SetCutValue(0.01*mm, "e-");
+// SetCutValue(0.01*mm, "e+");
+
+ // Retrieve verbose level
+ SetVerboseLevel(temp);
+}
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+void PhysicsList::ConstructDecay()
+{
+
+// Add Decay Process
+ G4Decay* theDecayProcess = new G4Decay() ;
+ theParticleIterator->reset() ;
+ while ((*theParticleIterator)()) {
+ G4ParticleDefinition* particle = theParticleIterator->value() ;
+ G4ProcessManager* pmanager = particle->GetProcessManager();
+ if (theDecayProcess->IsApplicable(*particle)) {
+ pmanager ->AddProcess(theDecayProcess);
+ // set ordering for PostStepDoIt and AtRestDoIt
+ pmanager->SetProcessOrdering(theDecayProcess, idxPostStep);
+ pmanager->SetProcessOrdering(theDecayProcess, idxAtRest);
+ }
+ }
+//end Add Decay Process
+
+}
+
+void PhysicsList::MyOwnConstruction()
+{
+ ConstructDecay();
+}
+
+
+
diff --git a/NPSimulation/src/Plastic.cc b/NPSimulation/src/Plastic.cc
index 38af5fda4f5e8a31b15479968f5b88e10c8e79a4..5ea1de1bc7f46737c5bfec824626706ea4efe198 100644
--- a/NPSimulation/src/Plastic.cc
+++ b/NPSimulation/src/Plastic.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/PrimaryGeneratorAction.cc b/NPSimulation/src/PrimaryGeneratorAction.cc
index cbd166afb8730957168dc46e6b608865af1cc484..b18c8f568f7e89e2599d52f17d443bfef8928947 100644
--- a/NPSimulation/src/PrimaryGeneratorAction.cc
+++ b/NPSimulation/src/PrimaryGeneratorAction.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/Sharc.cc b/NPSimulation/src/Sharc.cc
index 5c2214dff314e1e9a88882092c572fe48a222874..9cb81c97837fdd55c01eda076cceaf986f87cd17 100644
--- a/NPSimulation/src/Sharc.cc
+++ b/NPSimulation/src/Sharc.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/SharcScorers.cc b/NPSimulation/src/SharcScorers.cc
index dfbbf29b1c5a0ec7e2ce6f037a1762a42ef2c621..51c08da2f422a0ce4f742afaf2481f6651ef35c3 100644
--- a/NPSimulation/src/SharcScorers.cc
+++ b/NPSimulation/src/SharcScorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/Shield.cc b/NPSimulation/src/Shield.cc
index e309d4c4230928a7f77f5cae2baf389fc252d25d..2a27095c3b296a7c2b23a55f2d6f5cd319583a8d 100644
--- a/NPSimulation/src/Shield.cc
+++ b/NPSimulation/src/Shield.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ShieldClParis.cc b/NPSimulation/src/ShieldClParis.cc
index 87f673adfe7fa24774bfd4629421e23d8b784644..fce7ad167f97c4bad12a053a0a25edba455e3c2b 100644
--- a/NPSimulation/src/ShieldClParis.cc
+++ b/NPSimulation/src/ShieldClParis.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ShieldModule.cc b/NPSimulation/src/ShieldModule.cc
index 546486ce62b90d78e54febdeeb47cd9f2b0263d1..820caf6194a0794eab461babd8c1d6c6b79cd876 100644
--- a/NPSimulation/src/ShieldModule.cc
+++ b/NPSimulation/src/ShieldModule.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ShieldPhParis.cc b/NPSimulation/src/ShieldPhParis.cc
index 69beed88c2da1c0b7f67d57d6b962ed98cd10f05..d1394aac8ef45f62025e457de53b681c04e5f1c8 100644
--- a/NPSimulation/src/ShieldPhParis.cc
+++ b/NPSimulation/src/ShieldPhParis.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ShieldScorers.cc b/NPSimulation/src/ShieldScorers.cc
index 6748c306d3ebef17a36a9e802b00da27cc0c4f31..e4979720a974486ee138ec49c85618fc2d7127e7 100644
--- a/NPSimulation/src/ShieldScorers.cc
+++ b/NPSimulation/src/ShieldScorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/SteppingVerbose.cc b/NPSimulation/src/SteppingVerbose.cc
index eb8acb7d353702b254f71db0961605f3360fe23b..e2d8a1a4b2fd17cc3fd2c8a129f34c79954efcde 100644
--- a/NPSimulation/src/SteppingVerbose.cc
+++ b/NPSimulation/src/SteppingVerbose.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/Target.cc b/NPSimulation/src/Target.cc
index 284aee891233d30c82a7b6ee7cbf8f60c236ea16..05460179331207b8ae2f53c1200794481f1541d9 100644
--- a/NPSimulation/src/Target.cc
+++ b/NPSimulation/src/Target.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ThinSi.cc b/NPSimulation/src/ThinSi.cc
index cc94b60f93cd8d509f79a2b08bdf9ec605471676..e8a4490e2ec0dec06d2503e4f84e868b431d5280 100644
--- a/NPSimulation/src/ThinSi.cc
+++ b/NPSimulation/src/ThinSi.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/ThinSiScorers.cc b/NPSimulation/src/ThinSiScorers.cc
index eef8dfd3b3d4fe5f39e92ac1606c7c4aa4be2c26..378e10f7c7930ac81ebf732bc8ec1c2aa82cb5ed 100644
--- a/NPSimulation/src/ThinSiScorers.cc
+++ b/NPSimulation/src/ThinSiScorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/VDetector.cc b/NPSimulation/src/VDetector.cc
index 59ce7bc05e694cb3f7e97c62ddae95adb54e1719..9ab4f4f5f521dd9ac78349696f59e75b3ae87365 100644
--- a/NPSimulation/src/VDetector.cc
+++ b/NPSimulation/src/VDetector.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/VEventGenerator.cc b/NPSimulation/src/VEventGenerator.cc
index 2da902dfea0faf122ce31ff2ba6818b53dd781e1..c556771513cbbcb1655cd0e92ea5cf207036eef9 100644
--- a/NPSimulation/src/VEventGenerator.cc
+++ b/NPSimulation/src/VEventGenerator.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/W1.cc b/NPSimulation/src/W1.cc
index ffde31819ae670e60d9f0d3d1e15f6d63e9bc49a..a118ed1db80a016221959aadca489f8b558b51c6 100644
--- a/NPSimulation/src/W1.cc
+++ b/NPSimulation/src/W1.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
diff --git a/NPSimulation/src/W1Scorers.cc b/NPSimulation/src/W1Scorers.cc
index 6dffec56882a055351e2f0ab0d4abc00baeff266..cf285017bf96a893fea44ef69c25ae697d4daf2c 100644
--- a/NPSimulation/src/W1Scorers.cc
+++ b/NPSimulation/src/W1Scorers.cc
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2009-2010 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *