Tue 21 Aug 15:36:34 BST 2018

1 files changed, 79 insertions, 165 deletions

diff --git a/src/G4Interface.cxx b/src/G4Interface.cxx
index 36ba3d9..9f44d3e 100644
--- a/src/G4Interface.cxx
+++ b/src/G4Interface.cxx
@@ -1,23 +1,12 @@
-/**
- * Copyright (C) 2009
- * The IceCube collaboration
- * ID: $Id: G4Interface.cxx 149388 2016-08-18 21:50:04Z jgonzalez $
- *
- * @file G4Interface.cxx
- * @version $Rev: 149388 $
- * @date $Date: 2016-08-18 22:50:04 +0100 (Thu, 18 Aug 2016) $
- * @author Tilo Waldenmaier
- */
-
-#include <dataclasses/physics/I3Particle.h>
-
-#include <g4-tankresponse/g4classes/G4Interface.h>
-#include <g4-tankresponse/g4classes/G4BeamTestDetectorConstruction.h>
-#include <g4-tankresponse/g4classes/G4BeamTestPhysicsList.h>
-#include <g4-tankresponse/g4classes/G4BeamTestUserTrackingAction.h>
-#include <g4-tankresponse/g4classes/G4BeamTestUserSteppingAction.h>
-
-#include <icetray/I3Logging.h>
+/* #include <dataclasses/physics/I3Particle.h> */
+
+#include "G4Interface.h"
+#include "G4BeamTestDetectorConstruction.h"
+#include "G4BeamTestPhysicsList.h"
+#include "G4BeamTestUserTrackingAction.h"
+#include "G4BeamTestUserSteppingAction.h"
+
+/* #include <icetray/I3Logging.h> */
 
 #ifdef G4VIS_USE
 #include <G4VisExecutive.hh>
@@ -26,7 +15,7 @@
 #include <G4ParticleGun.hh>
 #include <G4ParticleTable.hh>
 #include <G4ParticleDefinition.hh>
-#include <G4UImanager.hh>
+/* #include <G4UImanager.hh> */
 
 
 G4Interface* G4Interface::g4Interface_ = NULL;
@@ -40,11 +29,8 @@ G4Interface::G4Interface(const std::string& visMacro):
   // Visualization manager
 #ifdef G4VIS_USE
   visManager_ = NULL;
-  if(!visMacro_.empty())
-  {
-    visManager_ = new G4VisExecutive();
-    visManager_->Initialize();
-  }
+  visManager_ = new G4VisExecutive();
+  visManager_->Initialize();
 #endif
 }
 
@@ -63,7 +49,8 @@ void G4Interface::InstallTank(G4BeamTestTank* tank)
 {
   if(initialized_)
   {
-    log_fatal("G4Interface aleady initialized. Cannot install tank!");
+    /* log_fatal("G4Interface aleady initialized. Cannot install tank!"); */
+    G4cout << "G4Interface aleady initialized. Cannot install tank!" << G4endl;
     return;
   }
 
@@ -92,117 +79,37 @@ void G4Interface::InitializeEvent()
 }
 
 
-void G4Interface::InjectParticle(const I3Particle& particle)
+void G4Interface::InjectParticle(
+        const std::string& particleName, const G4ThreeVector& particlePosition,
+        const G4ThreeVector& particleDirection, const G4double particleEnergy
+        )
 {
   if(!eventInitialized_)
   {
-    log_fatal("No event initialized. Cannot inject particle!");
+    /* log_fatal("No event initialized. Cannot inject particle!"); */
+    G4cout << "No event initialized. Cannot inject particle!" << G4endl;
     return;
   }
 
   G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable();
   G4ParticleDefinition* particleDef = NULL;
-  switch(particle.GetType())
-  {
-    case I3Particle::Gamma:
-       particleDef = particleTable->FindParticle("gamma");
-       break;
-    case I3Particle::EMinus:
-       particleDef = particleTable->FindParticle("e-");
-       break;
-    case I3Particle::EPlus:
-       particleDef = particleTable->FindParticle("e+");
-       break;
-    case I3Particle::MuMinus:
-       particleDef = particleTable->FindParticle("mu-");
-       break;
-    case I3Particle::MuPlus:
-       particleDef = particleTable->FindParticle("mu+");
-       break;
-    case I3Particle::PPlus:
-       particleDef = particleTable->FindParticle("proton");
-       break;
-    case I3Particle::PMinus:
-       particleDef = particleTable->FindParticle("anti_proton");
-       break;
-    case I3Particle::Neutron:
-       particleDef = particleTable->FindParticle("neutron");
-       break;
-#ifdef I3PARTICLE_SUPPORTS_PDG_ENCODINGS
-    case I3Particle::NeutronBar:
-#else
-    case 25:
-#endif
-       particleDef = particleTable->FindParticle("anti_neutron");
-       break;
-    case I3Particle::PiPlus:
-       particleDef = particleTable->FindParticle("pi+");
-       break;
-    case I3Particle::PiMinus:
-       particleDef = particleTable->FindParticle("pi-");
-       break;
-    case I3Particle::Pi0:
-       particleDef = particleTable->FindParticle("pi0");
-       break;
-    case I3Particle::KPlus:
-       particleDef = particleTable->FindParticle("kaon+");
-       break;
-    case I3Particle::KMinus:
-       particleDef = particleTable->FindParticle("kaon-");
-       break;
-    case I3Particle::K0_Long:
-       particleDef = particleTable->FindParticle("kaon0L");
-       break;
-    case I3Particle::K0_Short:
-       particleDef = particleTable->FindParticle("kaon0S");
-       break;
-    case I3Particle::NuE:
-       particleDef = particleTable->FindParticle("nu_e");
-       break;
-    case I3Particle::NuEBar:
-       particleDef = particleTable->FindParticle("anti_nu_e");
-       break;
-    case I3Particle::NuMu:
-       particleDef = particleTable->FindParticle("nu_mu");
-       break;
-    case I3Particle::NuMuBar:
-       particleDef = particleTable->FindParticle("anti_nu_mu");
-       break;
-    case I3Particle::NuTau:
-       particleDef = particleTable->FindParticle("nu_tau");
-       break;
-    case I3Particle::NuTauBar:
-       particleDef = particleTable->FindParticle("anti_nu_tau");
-       break;
-    default:
-      log_warn("Man, check out that strange particle \"%s\" ?!", particle.GetTypeString().c_str());
-      return;
-  }
-  
-  // Particle position in G4 units
-  G4ThreeVector position((particle.GetX() / I3Units::m) * CLHEP::m,
-                         (particle.GetY() / I3Units::m) * CLHEP::m,
-                         (particle.GetZ() / I3Units::m) * CLHEP::m);
+  particleDef = particleTable->FindParticle(particleName);
 
-  // Transform I3 coorinates to world system
-  position -= detector_->GetWorldOrigin();
-
-  G4ThreeVector direction(particle.GetDir().GetX(),
-                          particle.GetDir().GetY(),
-                          particle.GetDir().GetZ());
+  // Transform coordinates to world system
+  G4ThreeVector position = particlePosition - detector_->GetWorldOrigin();
 
   G4ParticleGun gun(1);
   gun.SetParticleDefinition(particleDef);
-  gun.SetParticleEnergy((particle.GetEnergy() / I3Units::GeV) * CLHEP::GeV);
+  gun.SetParticleEnergy(particleEnergy);
   gun.SetParticlePosition(position);
-  gun.SetParticleMomentumDirection(direction);
+  gun.SetParticleMomentumDirection(particleDirection);
 
-  log_trace("Injecting %s: x=%.2f m, y=%.2f m, z=%.2f m, E=%.3f MeV",
-            particle.GetTypeString().c_str(),
+  G4cout << "Injecting %s: x=%.2f m, y=%.2f m, z=%.2f m, E=%.3f MeV",
+            particleName.c_str(),
             position.x() / CLHEP::m,
             position.y() / CLHEP::m,
             position.z() / CLHEP::m,
-            gun.GetParticleEnergy() / CLHEP::MeV);
+            gun.GetParticleEnergy() / CLHEP::MeV;
 
   runManager_.InjectParticle(&gun);
 }
@@ -227,66 +134,73 @@ void G4Interface::Initialize()
 {
   if(initialized_)
   {
-    log_error("G4Interface has already been initialized. Ignoring this call!");
+    /* log_error("G4Interface has already been initialized. Ignoring this call!"); */
+    G4cout << "G4Interface has already been initialized. Ignoring this call!" << G4endl;
     return;
   }
 
-  log_debug("Init geometry ...");
+  /* log_debug("Init geometry ..."); */
+  G4cout << "Init geometry ..." << G4endl;
   runManager_.SetUserInitialization(detector_);
 
-  log_debug("Init physics list ...");
+  /* log_debug("Init physics list ..."); */
+  G4cout << "Init physics list ..." << G4endl;
   runManager_.SetUserInitialization(new G4BeamTestPhysicsList());
 
-  log_debug("Init UserTrackingAction ...");
+  /* log_debug("Init UserTrackingAction ..."); */
+  G4cout << "Init UserTrackingAction ..." << G4endl;
   runManager_.SetUserAction(new G4BeamTestUserTrackingAction());
 
-  log_debug("Init UserSteppingAction ...");
+  /* log_debug("Init UserSteppingAction ..."); */
+  G4cout << "Init UserSteppingAction ..." << G4endl;
   runManager_.SetUserAction(new G4BeamTestUserSteppingAction());
 
   // Initialize G4 kernel
-  log_debug("Init run manager ...");
+  /* log_debug("Init run manager ..."); */
+  G4cout << "Init run manager ..." << G4endl;
   runManager_.Initialize();
 
-  // Set verbosity
-  int verboseLevel = 0;
-  switch (GetIcetrayLogger()->LogLevelForUnit("G4Interface"))
-  {
-    case I3LOG_FATAL:
-    case I3LOG_ERROR:
-    case I3LOG_WARN:
-    case I3LOG_INFO:
-    case I3LOG_NOTICE:
-    default:
-      verboseLevel = 0;
-      break;
-    case I3LOG_DEBUG:
-      verboseLevel = 1;
-      break;
-    case I3LOG_TRACE:
-      verboseLevel = 2;
-      break;
-  }
-
-  runManager_.SetVerboseLevel(verboseLevel);
-  G4EventManager::GetEventManager()->SetVerboseLevel(verboseLevel);
-  G4EventManager::GetEventManager()->GetStackManager()->SetVerboseLevel(verboseLevel);
-  G4EventManager::GetEventManager()->GetTrackingManager()->SetVerboseLevel(verboseLevel);
-#ifdef G4VIS_USE
-  if(visManager_) visManager_->SetVerboseLevel(verboseLevel);
-#endif
+  /* // Set verbosity */
+  /* int verboseLevel = 0; */
+  /* switch (GetIcetrayLogger()->LogLevelForUnit("G4Interface")) */
+  /* { */
+  /*   case I3LOG_FATAL: */
+  /*   case I3LOG_ERROR: */
+  /*   case I3LOG_WARN: */
+  /*   case I3LOG_INFO: */
+  /*   case I3LOG_NOTICE: */
+  /*   default: */
+  /*     verboseLevel = 0; */
+  /*     break; */
+  /*   case I3LOG_DEBUG: */
+  /*     verboseLevel = 1; */
+  /*     break; */
+  /*   case I3LOG_TRACE: */
+  /*     verboseLevel = 2; */
+  /*     break; */
+  /* } */
+
+  // TODO(shivesh): verbosity
+/*   runManager_.SetVerboseLevel(verboseLevel); */
+/*   G4EventManager::GetEventManager()->SetVerboseLevel(verboseLevel); */
+/*   G4EventManager::GetEventManager()->GetStackManager()->SetVerboseLevel(verboseLevel); */
+/*   G4EventManager::GetEventManager()->GetTrackingManager()->SetVerboseLevel(verboseLevel); */
+/* #ifdef G4VIS_USE */
+/*   if(visManager_) visManager_->SetVerboseLevel(verboseLevel); */
+/* #endif */
 
   // Execute visualization macro (if specified)
-  if(!visMacro_.empty())
-  {
-    G4UImanager* uim = G4UImanager::GetUIpointer();
-
-    // Checking geometry
-    uim->ApplyCommand("/geometry/test/grid_test");
-
-    // Execute visualization macro
-    std::string visCmd = "/control/execute " + visMacro_;
-    uim->ApplyCommand(visCmd.c_str());
-  }
+  /* if(!visMacro_.empty()) */
+  /* { */
+  /*   G4UImanager* uim = G4UImanager::GetUIpointer(); */
+  /*  */
+  /*   // Checking geometry */
+  /*   uim->ApplyCommand("/geometry/test/grid_test"); */
+  /*  */
+  /*   // Execute visualization macro */
+  /*   std::string visCmd = "/control/execute " + visMacro_; */
+  /*   uim->ApplyCommand(visCmd.c_str()); */
+  /* } */
 
   initialized_ = true;
 }