From 04d27493adec62eba3c5ae934e6bde2cc58771fc Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Thu, 7 Feb 2013 12:12:12 +0000
Subject: [PATCH] * Update Liscence Header for NPS File - Put 2009-2013
copyright date - Change the place of the ifndef position to avoid multiple
inclusion of comment line
---
NPSimulation/include/AnnularS1.hh | 7 +-
NPSimulation/include/AnnularS1Scorers.hh | 8 +-
NPSimulation/include/Chamber.hh | 2 +-
NPSimulation/include/ComptonTelescope.hh | 7 +-
.../include/ComptonTelescopeScorers.hh | 7 +-
NPSimulation/include/DetectorConstruction.hh | 2 +-
NPSimulation/include/DummyDetector.hh | 2 +-
NPSimulation/include/Eurogam.hh | 2 +-
NPSimulation/include/EventAction.hh | 2 +-
NPSimulation/include/EventGeneratorBeam.hh | 2 +-
.../include/EventGeneratorGammaDecay.hh | 2 +-
.../include/EventGeneratorIsotropic.hh | 2 +-
.../include/EventGeneratorParticleDecay.hh | 2 +-
.../include/EventGeneratorTwoBodyReaction.hh | 2 +-
NPSimulation/include/GaspardScorers.hh | 7 +-
NPSimulation/include/GaspardTracker.hh | 7 +-
NPSimulation/include/GaspardTrackerAnnular.hh | 6 +-
.../include/GaspardTrackerDummyShape.hh | 7 +-
NPSimulation/include/GaspardTrackerModule.hh | 7 +-
NPSimulation/include/GaspardTrackerSquare.hh | 7 +-
.../include/GaspardTrackerTrapezoid.hh | 7 +-
NPSimulation/include/GeneralScorers.hh | 2 +-
NPSimulation/include/HydeScorers.hh | 9 +-
NPSimulation/include/HydeTracker.hh | 12 +-
NPSimulation/include/HydeTrackerAnnular.hh | 9 +-
NPSimulation/include/HydeTrackerDummyShape.hh | 11 +-
NPSimulation/include/HydeTrackerModule.hh | 9 +-
NPSimulation/include/HydeTrackerSquare.hh | 7 +-
NPSimulation/include/HydeTrackerTrapezoid.hh | 7 +-
NPSimulation/include/MUST2Array.hh | 2 +-
NPSimulation/include/Must2Scorers.hh | 2 +-
NPSimulation/include/Paris.hh | 7 +-
NPSimulation/include/ParisCluster.hh | 7 +-
NPSimulation/include/ParisModule.hh | 7 +-
NPSimulation/include/ParisPhoswich.hh | 7 +-
NPSimulation/include/ParisScorers.hh | 7 +-
NPSimulation/include/Particle.hh | 2 +-
NPSimulation/include/ParticleStack.hh | 2 +-
NPSimulation/include/PhysicsList.hh | 2 +-
NPSimulation/include/Plastic.hh | 2 +-
.../include/PrimaryGeneratorAction.hh | 2 +-
NPSimulation/include/Sharc.hh | 2 +-
NPSimulation/include/SharcScorers.hh | 2 +-
NPSimulation/include/Shield.hh | 7 +-
NPSimulation/include/ShieldClParis.hh | 7 +-
NPSimulation/include/ShieldModule.hh | 7 +-
NPSimulation/include/ShieldPhParis.hh | 7 +-
NPSimulation/include/ShieldScorers.hh | 7 +-
NPSimulation/include/SteppingVerbose.hh | 7 +-
NPSimulation/include/Target.hh | 2 +-
NPSimulation/include/ThinSi.hh | 2 +-
NPSimulation/include/ThinSiScorers.hh | 2 +-
NPSimulation/include/VDetector.hh | 2 +-
NPSimulation/include/VEventGenerator.hh | 2 +-
NPSimulation/include/W1.hh | 7 +-
NPSimulation/include/W1Scorers.hh | 7 +-
NPSimulation/src/AnnularS1.cc | 2 +-
NPSimulation/src/AnnularS1Scorers.cc | 2 +-
NPSimulation/src/Chamber.cc | 2 +-
NPSimulation/src/ComptonTelescope.cc | 2 +-
NPSimulation/src/ComptonTelescopeScorers.cc | 2 +-
NPSimulation/src/DetectorConstruction.cc | 2 +-
NPSimulation/src/DummyDetector.cc | 2 +-
NPSimulation/src/Eurogam.cc | 2 +-
NPSimulation/src/EventAction.cc | 2 +-
NPSimulation/src/EventGeneratorBeam.cc | 2 +-
NPSimulation/src/EventGeneratorGammaDecay.cc | 2 +-
NPSimulation/src/EventGeneratorIsotropic.cc | 2 +-
.../src/EventGeneratorParticleDecay.cc | 2 +-
.../src/EventGeneratorTwoBodyReaction.cc | 2 +-
NPSimulation/src/GaspardScorers.cc | 2 +-
NPSimulation/src/GaspardTracker.cc | 2 +-
NPSimulation/src/GaspardTrackerAnnular.cc | 2 +-
NPSimulation/src/GaspardTrackerDummyShape.cc | 2 +-
NPSimulation/src/GaspardTrackerModule.cc | 2 +-
NPSimulation/src/GaspardTrackerSquare.cc | 2 +-
NPSimulation/src/GaspardTrackerTrapezoid.cc | 2 +-
NPSimulation/src/GeneralScorers.cc | 2 +-
NPSimulation/src/HydeScorers.cc | 2 +-
NPSimulation/src/HydeTracker.cc | 2 +-
NPSimulation/src/HydeTrackerAnnular.cc | 2 +-
NPSimulation/src/HydeTrackerDummyShape.cc | 2 +-
NPSimulation/src/HydeTrackerModule.cc | 2 +-
NPSimulation/src/HydeTrackerSquare.cc | 2 +-
NPSimulation/src/HydeTrackerTrapezoid.cc | 2 +-
NPSimulation/src/MUST2Array.cc | 2 +-
NPSimulation/src/Must2Scorers.cc | 2 +-
NPSimulation/src/Paris.cc | 2 +-
NPSimulation/src/ParisCluster.cc | 2 +-
NPSimulation/src/ParisModule.cc | 2 +-
NPSimulation/src/ParisPhoswich.cc | 2 +-
NPSimulation/src/ParisScorers.cc | 2 +-
NPSimulation/src/Particle.cc | 2 +-
NPSimulation/src/ParticleStack.cc | 2 +-
NPSimulation/src/PhysicsList.cc | 698 +++++++++---------
NPSimulation/src/Plastic.cc | 2 +-
NPSimulation/src/PrimaryGeneratorAction.cc | 2 +-
NPSimulation/src/Sharc.cc | 2 +-
NPSimulation/src/SharcScorers.cc | 2 +-
NPSimulation/src/Shield.cc | 2 +-
NPSimulation/src/ShieldClParis.cc | 2 +-
NPSimulation/src/ShieldModule.cc | 2 +-
NPSimulation/src/ShieldPhParis.cc | 2 +-
NPSimulation/src/ShieldScorers.cc | 2 +-
NPSimulation/src/SteppingVerbose.cc | 2 +-
NPSimulation/src/Target.cc | 2 +-
NPSimulation/src/ThinSi.cc | 2 +-
NPSimulation/src/ThinSiScorers.cc | 2 +-
NPSimulation/src/VDetector.cc | 2 +-
NPSimulation/src/VEventGenerator.cc | 2 +-
NPSimulation/src/W1.cc | 2 +-
NPSimulation/src/W1Scorers.cc | 2 +-
112 files changed, 548 insertions(+), 542 deletions(-)
diff --git a/NPSimulation/include/AnnularS1.hh b/NPSimulation/include/AnnularS1.hh
index 2805c6865..d21ca62a6 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 bb8b11a0f..8703693a7 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 a543eaa10..e12941cf1 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 7e4b1cd28..f0a931c4b 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 502212ac8..369bc5b3c 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 e3b636998..021b44abd 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 89ccc759a..74b66c39e 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 de98ef5a8..714c663d5 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 6cc16bd69..1a81baf0a 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 3cf17cefb..099f4ce49 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 ed0aba76c..3cfd1d2e0 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 2da702dbf..3564bf6e3 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 93fc17f6a..c38bf69b4 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 b4143e246..85389059b 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 aa9c60d22..2e88e33a9 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 4ca87d728..69175a7d5 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 3e6ab8b68..e5c2882ca 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 85e3f7857..2295cba70 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 43335d27f..efd99b36b 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 6d6991632..f10b9cb9d 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 c5578b7c8..9834babc3 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 57e01667f..737158743 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 8535d2085..8f28a3e49 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 a8ad82ca2..0ada0c5ed 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 d7b219030..9ddc9ce89 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 8564b8e32..0ca74aa31 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 d3c8cdc13..e2429960e 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 be0a871e0..6d317558a 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 63d7a2eb3..d1a833c97 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 f6def0597..11b1868ca 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 18413b3a8..46fb11198 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 a4aa371ac..956f47cca 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 5b9e497ad..e5c9f8797 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 bdaca9670..3cf779b4c 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 68a86c41d..36da6f1d3 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 9ed0bd205..1b5fa31f5 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 d3eef1924..1fdb3c45f 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 b76cdba5b..e58d39073 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 9c8e3b55d..47f37522f 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 85ec1739c..78a6b3436 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 0313fa172..478d60ef9 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 f56d1a71e..eb33b7550 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 95225f5ef..6bae9a21d 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 fd6996676..b60a27578 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 c0d489dcf..c0260d423 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 cd0ff65d8..1499880cd 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 3dc7e800a..b791dce89 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 b61153fa1..67530832e 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 fc8ec3705..fcb64c25e 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 47f0f893c..0348a77ec 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 7d96c6020..df28fda41 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 33563f202..61e348a19 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 c5a5a12f0..a5ff1c7e1 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 5f8f32643..5ec0e7540 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 af8fe7f0d..95d03e948 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 e5fb885c9..8e222fa82 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 8438bba6e..6d572feb0 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 aaa7192c9..04ef13933 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 e0a61bb1d..a56bb3f43 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 a7539bcad..d8df3f991 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 12e8817e6..eadf77408 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 dd1c297a6..3993aed59 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 ada0b0e2f..9346d36b2 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 d9d2c9ed4..2bb690f99 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 45dec8735..45322725f 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 39be201db..3867bbe16 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 81fe995f6..9b5b8742f 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 e4a3d39f3..8584384c6 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 e50b250d1..9c31da651 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 2136cc88f..3e048c743 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 16a2b5287..83bf734b8 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 bd377f355..3130225d0 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 fce7062f1..b9873ceaa 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 22cf70dfd..1be4accdf 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 4fb280990..4687665fe 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 e53923e0a..3f0b13412 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 b0beab40b..5094093f4 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 57a4c74f0..2c8b40421 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 d75809cb9..59409ac25 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 8c83646cd..6d5599773 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 6982d3439..b5902dd7f 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 23053cd95..965c3b25f 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 9ddf93f44..a2d20980d 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 a544b1065..500296145 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 6f2bb950d..4252bfcd9 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 1b39c9db6..48252f189 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 b94747015..06601b2cb 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 649b85395..450b582de 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 df56f1e00..2ee93847d 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 a42856357..1b642c415 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 6bc6ce01c..03d95be6f 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 b21790a5b..e8a4b699a 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 4feffe6ef..82f1da484 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 69c1e4622..5c4eb7617 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 35ed164e7..78975bc4e 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 38af5fda4..5ea1de1bc 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 cbd166afb..b18c8f568 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 5c2214dff..9cb81c978 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 dfbbf29b1..51c08da2f 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 e309d4c42..2a27095c3 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 87f673adf..fce7ad167 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 546486ce6..820caf619 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 69beed88c..d1394aac8 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 6748c306d..e4979720a 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 eb8acb7d3..e2d8a1a4b 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 284aee891..054601793 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 cc94b60f9..e8a4490e2 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 eef8dfd3b..378e10f7c 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 59ce7bc05..9ab4f4f5f 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 2da902dfe..c55677151 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 ffde31819..a118ed1db 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 6dffec568..cf285017b 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 *
--
GitLab