Tue 21 Aug 15:36:34 BST 2018

13 files changed, 64 insertions, 207 deletions

diff --git a/include/G4BeamTestDetectorConstruction.h b/include/G4BeamTestDetectorConstruction.h
index ce53256..a3c0c9f 100644
--- a/include/G4BeamTestDetectorConstruction.h
+++ b/include/G4BeamTestDetectorConstruction.h
@@ -4,7 +4,7 @@
 #include <G4VUserDetectorConstruction.hh>
 #include <G4ThreeVector.hh>
 
-// class G4BeamTestTank;
+#include "G4BeamTestTank.h";
 
 class G4BeamTestDetectorConstruction: public G4VUserDetectorConstruction
 {
@@ -17,7 +17,7 @@ class G4BeamTestDetectorConstruction: public G4VUserDetectorConstruction
 
   void SetVerboseLevel(G4int level) {verboseLevel_=level;}
 
-  /* void InstallTank(G4BeamTestTank* tank) {tankList_.push_back(tank);} */
+  void InstallTank(G4BeamTestTank* tank) {tank_ = tank;}
 
   const G4ThreeVector& GetWorldOrigin() const {return origin_;}
 
@@ -39,7 +39,7 @@ class G4BeamTestDetectorConstruction: public G4VUserDetectorConstruction
 
   G4int verboseLevel_;
 
-  // std::vector<G4BeamTestTank*> tankList_;
+  G4BeamTestTank* tank_;
 };
 
 #endif
diff --git a/include/G4BeamTestEMPhysics.h b/include/G4BeamTestEMPhysics.h
index 797719e..bf20b62 100644
--- a/include/G4BeamTestEMPhysics.h
+++ b/include/G4BeamTestEMPhysics.h
@@ -1,15 +1,3 @@
-/*
- * copyright  (C) 2010
- * The Icecube Collaboration
- *
- * $Id: G4BeamTestEMPhysics.h 154687 2017-04-05 15:46:57Z jgonzalez $
- *
- * @version $Revision: 154687 $
- * @date $LastChangedDate: 2017-04-05 16:46:57 +0100 (Wed, 05 Apr 2017) $
- * @author Fabian Kislat <fabian.kislat@desy.de>, Peter Nießen (tanktop)
- * Last changed by: $LastChangedBy: jgonzalez $
- */
-
 #ifndef G4TANKRESPONSE_G4BEAMTESTEMPHYSICS_H_INCLUDED
 #define G4TANKRESPONSE_G4BEAMTESTEMPHYSICS_H_INCLUDED
 
diff --git a/include/G4BeamTestGeneralPhysics.h b/include/G4BeamTestGeneralPhysics.h
index 012bf40..19ab27b 100644
--- a/include/G4BeamTestGeneralPhysics.h
+++ b/include/G4BeamTestGeneralPhysics.h
@@ -1,14 +1,3 @@
-/*
- * copyright  (C) 2010
- * The Icecube Collaboration
- *
- * $Id: G4BeamTestGeneralPhysics.h 149388 2016-08-18 21:50:04Z jgonzalez $
- *
- * @version $Revision: 149388 $
- * @date $LastChangedDate: 2016-08-18 22:50:04 +0100 (Thu, 18 Aug 2016) $
- * @author Fabian Kislat <fabian.kislat@desy.de> Last changed by: $LastChangedBy: jgonzalez $
- */
-
 #ifndef G4TANKRESPONSE_G4BEAMTESTGENERALPHYSICS_H_INCLUDED
 #define G4TANKRESPONSE_G4BEAMTESTGENERALPHYSICS_H_INCLUDED
 
diff --git a/include/G4BeamTestHadronPhysics.h b/include/G4BeamTestHadronPhysics.h.backup
index 0fd9868..dc2bf67 100644
--- a/include/G4BeamTestHadronPhysics.h
+++ b/include/G4BeamTestHadronPhysics.h.backup
@@ -1,14 +1,3 @@
-/*
- * copyright  (C) 2010
- * The Icecube Collaboration
- *
- * $Id: G4BeamTestHadronPhysics.h 154687 2017-04-05 15:46:57Z jgonzalez $
- *
- * @version $Revision: 154687 $
- * @date $LastChangedDate: 2017-04-05 16:46:57 +0100 (Wed, 05 Apr 2017) $
- * @author Fabian Kislat <fabian.kislat@desy.de> Last changed by: $LastChangedBy: jgonzalez $
- */
-
 #ifndef G4TANKRESPONSE_G4BEAMTESTHADRONPHYSICS_H_INCLUDED
 #define G4TANKRESPONSE_G4BEAMTESTHADRONPHYSICS_H_INCLUDED
 
diff --git a/include/G4BeamTestIonPhysics.h b/include/G4BeamTestIonPhysics.h.backup
index 276b0d5..0a9d5f1 100644
--- a/include/G4BeamTestIonPhysics.h
+++ b/include/G4BeamTestIonPhysics.h.backup
@@ -1,15 +1,3 @@
-/*
- * copyright  (C) 2010
- * The Icecube Collaboration
- *
- * $Id: G4BeamTestIonPhysics.h 154687 2017-04-05 15:46:57Z jgonzalez $
- *
- * @version $Revision: 154687 $
- * @date $LastChangedDate: 2017-04-05 16:46:57 +0100 (Wed, 05 Apr 2017) $
- * @author Fabian Kislat <fabian.kislat@desy.de>, Peter Nießen (tanktop)
- * Last changed by: $LastChangedBy: jgonzalez $
- */
-
 #ifndef G4TANKRESPONSE_G4BEAMTESTIONPHYSICS_H_INCLUDED
 #define G4TANKRESPONSE_G4BEAMTESTIONPHYSICS_H_INCLUDED
 
diff --git a/include/G4BeamTestMuonPhysics.h b/include/G4BeamTestMuonPhysics.h
index de09d73..0c53595 100644
--- a/include/G4BeamTestMuonPhysics.h
+++ b/include/G4BeamTestMuonPhysics.h
@@ -1,15 +1,3 @@
-/*
- * copyright  (C) 2010
- * The Icecube Collaboration
- *
- * $Id: G4BeamTestMuonPhysics.h 154687 2017-04-05 15:46:57Z jgonzalez $
- *
- * @version $Revision: 154687 $
- * @date $LastChangedDate: 2017-04-05 16:46:57 +0100 (Wed, 05 Apr 2017) $
- * @author Fabian Kislat <fabian.kislat@desy.de>, Peter Nießen (tanktop)
- * Last changed by: $LastChangedBy: jgonzalez $
- */
-
 #ifndef G4TANKRESPONSE_G4BEAMTESTMUONPHYSICS_H_INCLUDED
 #define G4TANKRESPONSE_G4BEAMTESTMUONPHYSICS_H_INCLUDED
 
@@ -20,7 +8,7 @@
 #include <G4MuPairProduction.hh>
 #include <G4MuIonisation.hh>
 #include <G4hIonisation.hh>
-#include <G4MuonMinusCaptureAtRest.hh>
+#include <G4MuonMinusCapture.hh>
 
 /**
    @class G4BeamTestMuonPhysics
@@ -58,7 +46,7 @@ private:
   G4MuBremsstrahlung     muMinusBremsstrahlung_;
   G4MuPairProduction     muMinusPairProduction_;
 
-  G4MuonMinusCaptureAtRest muMinusCaptureAtRest_;
+  G4MuonMinusCapture muMinusCapture_;
 
   // Tau physics
   G4MuMultipleScattering   tauPlusMultipleScattering_;
diff --git a/include/G4BeamTestPhysicsList.h b/include/G4BeamTestPhysicsList.h
index e253e33..7fb7ed5 100644
--- a/include/G4BeamTestPhysicsList.h
+++ b/include/G4BeamTestPhysicsList.h
@@ -1,14 +1,3 @@
-/**
- * Copyright (C) 2009
- * The IceCube collaboration
- * ID: $Id: G4BeamTestPhysicsList.h 149388 2016-08-18 21:50:04Z jgonzalez $
- *
- * @file G4BeamTestPhysicsList.h
- * @version $Rev: 149388 $
- * @date $Date: 2016-08-18 22:50:04 +0100 (Thu, 18 Aug 2016) $
- * @author Tilo Waldenmaier, Thomas Melzig, Fabian Kislat
- */
-
 #ifndef _TOPSIMULATOR_G4BEAMTESTPHYSICSLIST_H
 #define _TOPSIMULATOR_G4BEAMTESTPHYSICSLIST_H
 
diff --git a/include/G4BeamTestRunManager.h b/include/G4BeamTestRunManager.h
index c142b38..a7eaff0 100644
--- a/include/G4BeamTestRunManager.h
+++ b/include/G4BeamTestRunManager.h
@@ -1,15 +1,3 @@
-/**
- * Copyright (C) 2009
- * The IceCube collaboration
- * ID: $Id: G4BeamTestRunManager.h 149391 2016-08-18 21:58:04Z jgonzalez $
- *
- * @file G4BeamTestRunManager.h
- * @version $Rev: 149391 $
- * @date $Date: 2016-08-18 22:58:04 +0100 (Thu, 18 Aug 2016) $
- * @author Tilo Waldenmaier
- */
-
-
 #ifndef TOPSIMULATOR_G4BEAMTESTRUNMANAGER_H
 #define TOPSIMULATOR_G4BEAMTESTRUNMANAGER_H
 
@@ -25,7 +13,7 @@ class G4BeamTestRunManager: public G4RunManager
  public:
   G4BeamTestRunManager();
 
-  static G4BeamTestRunManager* GetIceTopRunManager() {return (G4IceTopRunManager*)GetRunManager();}
+  static G4BeamTestRunManager* GetIceTopRunManager() {return (G4BeamTestRunManager*)GetRunManager();}
 
   // Disable BeamOn
   void BeamOn(G4int n_event,const char* macroFile=0,G4int n_select=-1);
diff --git a/include/G4BeamTestTank.h b/include/G4BeamTestTank.h
index b08e223..c7a1713 100644
--- a/include/G4BeamTestTank.h
+++ b/include/G4BeamTestTank.h
@@ -1,22 +1,10 @@
-/**
- * Copyright (C) 2009
- * The IceCube collaboration
- * ID: $Id: G4BeamTestTank.h 149431 2016-08-19 17:38:06Z jgonzalez $
- *
- * @file G4BeamTestTank.h
- * @version $Rev: 149431 $
- * @date $Date: 2016-08-19 18:38:06 +0100 (Fri, 19 Aug 2016) $
- * @author Tilo Waldenmaier, Thomas Melzig
- */
-
-
 #ifndef _TOPSIMULATOR_G4BEAMTESTTANK_H_
 #define _TOPSIMULATOR_G4BEAMTESTTANK_H_
 
-class OMKey;
-struct TankKey;
-class I3Geometry;
-class I3Position;
+// class OMKey;
+// struct TankKey;
+// class I3Geometry;
+// class I3Position;
 
 class G4LogicalVolume;
 class G4VPhysicalVolume;
@@ -26,8 +14,6 @@ class G4TankIceSD;
 #include <G4ThreeVector.hh>
 #include <map>
 
-#include <icetray/I3Logging.h>
-
 /**
  * This class constructs the physical volume of single tanks, serves as bridge to the sensitive detector in the tank, and computes the location of the point that define the snow surface. It also stores the basic tank dimensions (height, radius, snow).
  *
@@ -39,49 +25,49 @@ class G4TankIceSD;
 class G4BeamTestTank
 {
  public:
-  G4BeamTestTank(const TankKey& tankKey, const I3Geometry& geometry);
+  G4BeamTestTank(/* const TankKey& tankKey, const I3Geometry& geometry */);
 
   ~G4BeamTestTank();
 
   const G4ThreeVector& GetPos() const {return position_;}
 
-  /// Position of center of the tank
-  I3Position GetPos_I3();
-  double GetX_I3();
-  double GetY_I3();
-  double GetZ_I3();
+  /* /// Position of center of the tank */
+  /* I3Position GetPos_I3(); */
+  /* double GetX_I3(); */
+  /* double GetY_I3(); */
+  /* double GetZ_I3(); */
 
-  /// Delaunay points around tank
-  const G4ThreeVector& GetDelaunayPoint1() const {return delaunayPoint1_;}
-  const G4ThreeVector& GetDelaunayPoint2() const {return delaunayPoint2_;}
-  const G4ThreeVector& GetDelaunayPoint3() const {return delaunayPoint3_;}
+  /* /// Delaunay points around tank */
+  /* const G4ThreeVector& GetDelaunayPoint1() const {return delaunayPoint1_;} */
+  /* const G4ThreeVector& GetDelaunayPoint2() const {return delaunayPoint2_;} */
+  /* const G4ThreeVector& GetDelaunayPoint3() const {return delaunayPoint3_;} */
 
   /// Tank dimensions in Geant4 units
   G4double GetTankHeight_G4() {return tankHeight_;}
   G4double GetTankRadius_G4() {return outerRadius_;}
-  G4double GetSnowHeight_G4() {return snowHeight_;}
+  G4double GetFillHeight_G4() {return fillHeight_;}
 
-  /// Tank dimensions in IceCube units and reference system
-  double   GetTankHeight_I3();
-  double   GetTankRadius_I3();
-  double   GetSnowHeight_I3();
+  /* /// Tank dimensions in IceCube units and reference system */
+  /* double   GetTankHeight_I3(); */
+  /* double   GetTankRadius_I3(); */
+  /* double   GetSnowHeight_I3(); */
 
   /// Energy deposit for a given OM, in Geant4 units (from G4TankIceSD)
-  G4double GetEDep_G4(const OMKey& omKey);
+  G4double GetEDep_G4(/* const OMKey& omKey */);
   /// Emission time for a given OM, in Geant4 units (from G4TankIceSD)
-  G4double GetTime_G4(const OMKey& omKey);
+  G4double GetTime_G4(/* const OMKey& omKey */);
 
-  /// Energy deposit for a given OM, in Geant4 units (from G4TankIceSD)
-  double   GetEDep_I3(const OMKey& omKey);
-  /// Emission time for a given OM, in Geant4 units (from G4TankIceSD)
-  double   GetTime_I3(const OMKey& omKey);
+  /* /// Energy deposit for a given OM, in Geant4 units (from G4TankIceSD) */
+  /* double   GetEDep_I3(const OMKey& omKey); */
+  /* /// Emission time for a given OM, in Geant4 units (from G4TankIceSD) */
+  /* double   GetTime_I3(const OMKey& omKey); */
 
   /// Number of Cherenkovs for a given OM (from G4TankIceSD)
-  double GetNumCherenkov(const OMKey& omKey);
+  double GetNumCherenkov(/* const OMKey& omKey */);
   /// Number of Cherenkovs weighted by emission point (from G4TankIceSD)
-  double GetNumCherenkovWeight(const OMKey& omKey);
+  double GetNumCherenkovWeight(/* const OMKey& omKey */);
 
-  const TankKey& GetTankKey() const {return tankKey_;}
+  /* const TankKey& GetTankKey() const {return tankKey_;} */
 
   /// Method to call when constructing detector
   G4VPhysicalVolume* InstallTank(G4VPhysicalVolume* mother, const G4ThreeVector& origin);
@@ -94,27 +80,27 @@ class G4BeamTestTank
   G4double innerRadius_;
   G4double outerRadius_;
 
-  G4double snowHeight_;
-  G4double perliteHeight_;
+  G4double waterHeight_;
+  G4double airHeight_;
 
   G4double glassOuterRadius_;
   G4double glassThickness_;
 
   G4ThreeVector position_;
 
-  G4ThreeVector delaunayPoint1_;
-  G4ThreeVector delaunayPoint2_;
-  G4ThreeVector delaunayPoint3_;
-
-  std::map<OMKey, G4ThreeVector> relDomPositions_;
+  // G4ThreeVector delaunayPoint1_;
+  // G4ThreeVector delaunayPoint2_;
+  // G4ThreeVector delaunayPoint3_;
+  //
+  // std::map<OMKey, G4ThreeVector> relDomPositions_;
 
   G4LogicalVolume* tankLog_;
   G4TankIceSD* iceSD_;
 
-  const TankKey& tankKey_;
-  const I3Geometry& geometry_;
+  /* const TankKey& tankKey_; */
+  /* const I3Geometry& geometry_; */
 
-  SET_LOGGER("G4BeamTestTank");
+  /* SET_LOGGER("G4BeamTestTank"); */
 };
 
 #endif
diff --git a/include/G4BeamTestUserSteppingAction.h b/include/G4BeamTestUserSteppingAction.h
index 9807bbf..2d09799 100644
--- a/include/G4BeamTestUserSteppingAction.h
+++ b/include/G4BeamTestUserSteppingAction.h
@@ -1,19 +1,5 @@
 #ifndef G4BEAMTESTUSERSTEPPINGACTION_H_INCLUDED
 #define G4BEAMTESTUSERSTEPPINGACTION_H_INCLUDED
-/**
- * Copyright (C) 2011
- * The IceCube collaboration
- * ID: $Id$
- *
- * @file G4BeamTestUserSteppingAction.h
- * @version $Revision$
- * @date $Date$
- * @author Thomas Melzig
- *
- * $LastChangedBy$
- */
-
-
 #include "G4UserSteppingAction.hh"
 
 /**
diff --git a/include/G4BeamTestUserTrackingAction.h b/include/G4BeamTestUserTrackingAction.h
index bb6d155..9786f52 100644
--- a/include/G4BeamTestUserTrackingAction.h
+++ b/include/G4BeamTestUserTrackingAction.h
@@ -1,19 +1,5 @@
 #ifndef G4BEAMTESTUSERTRACKINGACTION_H_INCLUDED
 #define G4BEAMTESTUSERTRACKINGACTION_H_INCLUDED
-/**
- * Copyright (C) 2011
- * The IceCube collaboration
- * ID: $Id$
- *
- * @file G4BeamTestUserTrackingAction.h
- * @version $Revision$
- * @date $Date$
- * @author Thomas Melzig
- *
- * $LastChangedBy$
- */
-
-
 #include "G4UserTrackingAction.hh"
 
 /**
diff --git a/include/G4Interface.h b/include/G4Interface.h
index c9bec07..4b88f00 100644
--- a/include/G4Interface.h
+++ b/include/G4Interface.h
@@ -1,19 +1,8 @@
-/**
- * Copyright (C) 2009
- * The IceCube collaboration
- * ID: $Id: G4Interface.h 149388 2016-08-18 21:50:04Z jgonzalez $
- *
- * @file G4Interface.h
- * @version $Rev: 149388 $
- * @date $Date: 2016-08-18 22:50:04 +0100 (Thu, 18 Aug 2016) $
- * @author Tilo Waldenmaier
- */
-
 #ifndef _TOPSIM_G4INTERFACE_H_
 #define _TOPSIM_G4INTERFACE_H_
 
-#include <g4-tankresponse/g4classes/G4BeamTestRunManager.h>
-#include <icetray/I3Logging.h>
+#include "G4BeamTestRunManager.h"
+/* #include <icetray/I3Logging.h> */
 
 #ifdef G4VIS_USE
 class G4VisManager;
@@ -44,7 +33,10 @@ class G4Interface
   /// To be called after simulating each IceTray event.
   void TerminateEvent();
   /// Simulate a single particle (InitializeEvent must be called first)
-  void InjectParticle(const I3Particle& particle);
+  void InjectParticle(const std::string& particleName,
+          const G4ThreeVector& particlePosition,
+          const G4ThreeVector& particleDirection,
+          const G4double particleEnergy);
 
  private:
   void Initialize();
@@ -62,7 +54,7 @@ class G4Interface
   bool eventInitialized_;
   std::string visMacro_;
 
-  SET_LOGGER("G4Interface");
+  /* SET_LOGGER("G4Interface"); */
 };
 
 #endif
diff --git a/include/G4TankIceSD.h b/include/G4TankIceSD.h
index 75375c1..25ce7ca 100644
--- a/include/G4TankIceSD.h
+++ b/include/G4TankIceSD.h
@@ -1,24 +1,12 @@
-/**
- * Copyright (C) 2009
- * The IceCube collaboration
- * ID: $Id: G4TankIceSD.h 149388 2016-08-18 21:50:04Z jgonzalez $
- *
- * @file G4TankIceSD.h
- * @version $Rev: 149388 $
- * @date $Date: 2016-08-18 22:50:04 +0100 (Thu, 18 Aug 2016) $
- * @author Tilo Waldenmaier, Thomas Melzig
- */
-
-
 #ifndef _G4TANKRESPONSE_G4TankIceSD_H
 #define _G4TANKRESPONSE_G4TankIceSD_H
 
-#include <icetray/OMKey.h>
+/* #include <icetray/OMKey.h> */
 
 #include <G4VSensitiveDetector.hh>
 #include <G4ThreeVector.hh>
 
-#include <map>
+/* #include <map> */
 
 class G4Step;
 class G4HCofThisEvent;
@@ -26,7 +14,7 @@ class G4TouchableHistory;
 
 
 /**
- * An "ice sensitive detector". This sensitive detector is meant to be associated with the ice logical volume in a tank.
+ * An "ice sensitive detector". This sensitive detector is meant to be associated with the ice logical volume in a tank. TODO(shivesh): make the PMT the SD
  *
  * This class keeps track of the energy losses and number Cherenkov photons produced in the ice of each tank.
  * The Cherenkov photons are counted in two ways. One is a simple count and the other is a weighted count
@@ -35,7 +23,7 @@ class G4TouchableHistory;
 class G4TankIceSD : public G4VSensitiveDetector
 {
  public:
-   G4TankIceSD(G4String name, const std::map<OMKey, G4ThreeVector>& domPositions);
+   G4TankIceSD(G4String name/* , const std::map<OMKey, G4ThreeVector>& domPositions */);
   ~G4TankIceSD();
 
   /// Methods called by Geant4 framework
@@ -44,26 +32,26 @@ class G4TankIceSD : public G4VSensitiveDetector
   void EndOfEvent(G4HCofThisEvent *HCE);
 
   /// Get total energy deposit for a given OM (same for both OMs in a tank)
-  G4double GetEDep(const OMKey& omKey) {return sumEdep_[omKey];}
+  G4double GetEDep(/* const OMKey& omKey */) {return sumEdep_/* [omKey] */;}
   /// Get average emission time weighted by deposited energy (same for both OMs in a tank)
-  G4double GetTime(const OMKey& omKey) {return cogTime_[omKey];}
+  G4double GetTime(/* const OMKey& omKey */) {return cogTime_/* [omKey] */;}
   /// Get number of Cherenkov photons for a given OM (same for both OMs in a tank)
-  G4double GetNumCherenkov(const OMKey& omKey) {return cherenkovCounter_[omKey];}
+  G4double GetNumCherenkov(/* const OMKey& omKey */) {return cherenkovCounter_/* [omKey] */;}
   /// Get number of Cherenkov photons for a given OM weighted relative to emission point
-  G4double GetNumCherenkovWeight(const OMKey& omKey) {return cherenkovCounterWeight_[omKey];}
+  G4double GetNumCherenkovWeight(/* const OMKey& omKey */) {return cherenkovCounterWeight_/* [omKey] */;}
 
  private:
   //ExN04TrackerHitsCollection *trackerCollection;
-  const std::map<OMKey, G4ThreeVector> domPositions_;
+  const G4ThreeVector domPositions_;
 
   /// Cherenkov production. See technical note
   G4double GetCerenkovNumber(G4Step* aStep);
   G4double GetProbability(G4double radius, G4double height);
 
-  std::map<OMKey, G4double> sumEdep_;
-  std::map<OMKey, G4double> cogTime_;
-  std::map<OMKey, G4double> cherenkovCounter_;
-  std::map<OMKey, G4double> cherenkovCounterWeight_;
+  G4double sumEdep_;
+  G4double cogTime_;
+  G4double cherenkovCounter_;
+  G4double cherenkovCounterWeight_;
 };
 
 #endif