Changeset 1342 for trunk/examples/extended/medical/GammaTherapy/src

Timestamp:

Nov 5, 2010, 4:08:39 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/examples/extended/medical/GammaTherapy/src

Files:

• Histo.cc (modified) (18 diffs)
• TrackingAction.cc (modified) (2 diffs)

trunk/examples/extended/medical/GammaTherapy/src/Histo.cc

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: Histo.cc,v 1.10 2010/10/26 12:05:14 vnivanch Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
+//
 //---------------------------------------------------------------------------
 //
@@ -38 +41 @@
 
 #include "Histo.hh"
+#include "G4Gamma.hh"
+#include "G4Electron.hh"
+#include "G4Positron.hh"
+#include "G4Neutron.hh"
 #include <iomanip>
 
@@ -65 +72 @@
   verbose   = 1;
   histName  = G4String("histo");
-  histType  = G4String("hbook");
+  histType  = G4String("root");
   nHisto    = 10;
   nHisto1   = 10;
@@ -76 +83 @@
   absorberR = 200.*mm;
   scoreZ    = 100.*mm;
+
+  gamma    = G4Gamma::Gamma();
+  electron = G4Electron::Electron();
+  positron = G4Positron::Positron();
+  neutron  = G4Neutron::Neutron();
 
 #ifdef G4ANALYSIS_USE
@@ -206 +218 @@
     }
     tree->close();
+    delete tree;
+    tree = 0;
     G4cout << "Tree is closed" << G4endl;
   }
@@ -256 +270 @@
 
   // Creating a tree mapped to a new hbook file.
-  G4String tt = "hbook";
-  G4String nn = histName + ".hbook";
-  if(histType == "root") {
-    tt = "root";
-    nn = histName + ".root";
-  } else if(histType == "xml" || histType == "XML" 
-            || histType == "aida" || histType == "AIDA") {
+  G4String tt = histType;
+  G4String nn = histName + "." + histType;
+  if(histType == "xml" || histType == "XML" || histType == "aida" || 
+     histType == "AIDA") {
     tt = "xml";
     nn = histName + ".aida";
   }
 
-  tree = tf->create(nn,tt,false,true, "--noErrors uncompress");
+  tree = tf->create(nn,tt,false,true, "");
   if(tree) {
     G4cout << "Tree store : " << tree->storeName() << G4endl;
@@ -317 +328 @@
   // If using Anaphe HBOOK implementation, there is a limitation on the
   // length of the variable names in a ntuple
-  if(nTuple) 
+  if(nTuple) {
      ntup = tpf->create( "100", "Dose deposite","float r, z, e" );
-
+  }
   delete hf;
   delete tpf;
@@ -330 +341 @@
 {
   G4double e = elec->GetKineticEnergy()/MeV;
-  if(e > 0.0) n_elec++;
+  if(e > 0.0) { ++n_elec; }
 }
 
@@ -338 +349 @@
 {
   G4double e = ph->GetKineticEnergy()/MeV;
-  if(e > 0.0) n_gam++;
+  if(e > 0.0) { ++n_gam; }
 }
 
@@ -346 +357 @@
 {
   G4double e = ph->GetKineticEnergy()/MeV;
-  if(e > 0.0) n_gam_tar++;
+  if(e > 0.0) { ++n_gam_tar; }
 #ifdef G4ANALYSIS_USE
   if(tree) histo[5]->fill(e,1.0);
@@ -357 +368 @@
 {
   G4double e = ph->GetKineticEnergy()/MeV;
-  if(e > 0.0) n_gam_ph++;
+  if(e > 0.0) { ++n_gam_ph; }
 }
 
@@ -365 +376 @@
 {
   G4double e = ph->GetKineticEnergy()/MeV;
-  if(e > 0.0) n_e_tar++;
+  if(e > 0.0) { ++n_e_tar; }
 #ifdef G4ANALYSIS_USE
   if(tree) histo[8]->fill(e,1.0);
@@ -376 +387 @@
 {
   G4double e = ph->GetKineticEnergy()/MeV;
-  if(e > 0.0) n_e_ph++;
+  if(e > 0.0) { ++n_e_ph; }
 #ifdef G4ANALYSIS_USE
   if(tree) histo[7]->fill(e,1.0);
@@ -389 +400 @@
 
   ResetTrackLength();
-  G4ParticleDefinition* particle = aTrack->GetDefinition();
-  G4String name = particle->GetParticleName();
+  const G4ParticleDefinition* particle = aTrack->GetParticleDefinition();
   G4int pid = aTrack->GetParentID();
   G4double kinE = aTrack->GetKineticEnergy();
@@ -416 +426 @@
 
     // delta-electron
-  } else if (0 < pid && "e-" == name) {
+  } else if (0 < pid && particle == electron) {
     if(1 < verbose) {
       G4cout << "TrackingAction: Secondary electron " << G4endl;
     }
     AddDeltaElectron(dp);
-    if(pv == phantom)                       AddPhantomElectron(dp);
-    else if(pv == target1 || pv == target2) AddTargetElectron(dp);
-
-  } else if (0 < pid && "e+" == name) {
+    if(pv == phantom)                       { AddPhantomElectron(dp); }
+    else if(pv == target1 || pv == target2) { AddTargetElectron(dp); }
+
+  } else if (0 < pid && particle == positron) {
     if(1 < verbose) {
       G4cout << "TrackingAction: Secondary positron " << G4endl;
@@ -430 +440 @@
     AddPositron(dp);
 
-  } else if (0 < pid && "gamma" == name) {
+  } else if (0 < pid && particle == gamma) {
     if(1 < verbose) {
       G4cout << "TrackingAction: Secondary gamma; parentID= " << pid
@@ -436 +446 @@
     }
     AddPhoton(dp);
-    if(pv == phantom)                       AddPhantomPhoton(dp);
-    else if(pv == target1 || pv == target2) AddTargetPhoton(dp);
-
-  } else if (0 < pid && "neutron" == name) {
+    if(pv == phantom)                       { AddPhantomPhoton(dp); }
+    else if(pv == target1 || pv == target2) { AddTargetPhoton(dp); }
+
+  } else if (0 < pid && particle == neutron) {
     n_neutron++;
     if(1 < verbose) {
@@ -455 +465 @@
   sumR += e;
   G4int bin = (G4int)(e/stepE);
-  if(bin >= nBinsE) bin = nBinsE-1;
+  if(bin >= nBinsE) { bin = nBinsE-1; }
   gammaE[bin] += e;
   G4int bin1 = (G4int)(r/stepR);
-  if(bin1 >= nBinsR) bin1 = nBinsR-1;
+  if(bin1 >= nBinsR) { bin1 = nBinsR-1; }
 #ifdef G4ANALYSIS_USE
   if(tree) {

trunk/examples/extended/medical/GammaTherapy/src/TrackingAction.cc

@@ -56 +56 @@
 TrackingAction::TrackingAction():
   theHisto(Histo::GetPointer())
-{;}
+{}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 TrackingAction::~TrackingAction()
-{;}
+{}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -68 +68 @@
 {
   theHisto->ScoreNewTrack(aTrack);
-  G4int pid = aTrack->GetParentID();
-  const G4String name = aTrack->GetDefinition()->GetParticleName();
 
   if(1 < theHisto->GetVerbose() &&
-    (theHisto->GetMaxEnergy() < aTrack->GetKineticEnergy() && pid > 0))
-  {
-    G4cout << "Track #"
-           << aTrack->GetTrackID() << " of " << name
-           << " Emax(MeV)= " << theHisto->GetMaxEnergy()/MeV
-           << " Ekin(MeV)= " << aTrack->GetKineticEnergy()/MeV
-           << " ## EventID= "
-           << (G4EventManager::GetEventManager())->GetConstCurrentEvent()
-              ->GetEventID()
-           << G4endl;
-  }
+     theHisto->GetMaxEnergy() < aTrack->GetKineticEnergy() && 
+     aTrack->GetParentID() > 0)
+    {
+      G4cout << "Track #"
+             << aTrack->GetTrackID() << " of " 
+             << aTrack->GetParticleDefinition()->GetParticleName()
+             << " Emax(MeV)= " << theHisto->GetMaxEnergy()/MeV
+             << " Ekin(MeV)= " << aTrack->GetKineticEnergy()/MeV
+             << " ## EventID= "
+             << (G4EventManager::GetEventManager())->GetConstCurrentEvent()->GetEventID()
+             << G4endl;
+    }
 
 }