Changeset 1313 for trunk/examples/advanced/hadrontherapy/src/HadrontherapyPrimaryGeneratorAction.cc

Timestamp:

Jun 14, 2010, 3:54:58 PM (14 years ago)

Author:

garnier

Message:

geant4.9.4 beta rc0

File:

• trunk/examples/advanced/hadrontherapy/src/HadrontherapyPrimaryGeneratorAction.cc (modified) (5 diffs)

trunk/examples/advanced/hadrontherapy/src/HadrontherapyPrimaryGeneratorAction.cc

@@ -86 +86 @@
   sigmaEnergy = defaultsigmaEnergy;
   
-#ifdef ANALYSIS_USE
+#ifdef G4ANALYSIS_USE_ROOT
   // Write these values into the analysis if needed. Have to be written separately on change.
-  HadrontherapyAnalysisManager::getInstance()->setBeamMetaData(meanKineticEnergy, sigmaEnergy);
+  HadrontherapyAnalysisManager::GetInstance()->setBeamMetaData(meanKineticEnergy, sigmaEnergy);
 #endif
 
@@ -120 +120 @@
 void HadrontherapyPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
 {
-#ifdef ANALYSIS_USE
+#ifdef G4ANALYSIS_USE_ROOT
   // Increment the event counter
-  HadrontherapyAnalysisManager::getInstance()->startNewEvent();
+  HadrontherapyAnalysisManager::GetInstance()->startNewEvent();
 #endif
 
@@ -178 +178 @@
 {
         meanKineticEnergy = val;
-#ifdef ANALYSIS_USE
+#ifdef G4ANALYSIS_USE_ROOT
   // Update the beam-data in the analysis manager
-  HadrontherapyAnalysisManager::getInstance()->setBeamMetaData(meanKineticEnergy, sigmaEnergy);
+  HadrontherapyAnalysisManager::GetInstance()->setBeamMetaData(meanKineticEnergy, sigmaEnergy);
 #endif
 
@@ -188 +188 @@
 { 
         sigmaEnergy = val;
-#ifdef ANALYSIS_USE
+#ifdef G4ANALYSIS_USE_ROOT
   // Update the sigmaenergy in the metadata.
-  HadrontherapyAnalysisManager::getInstance()->setBeamMetaData(meanKineticEnergy, sigmaEnergy);
+  HadrontherapyAnalysisManager::GetInstance()->setBeamMetaData(meanKineticEnergy, sigmaEnergy);
 #endif
 }
@@ -217 +217 @@
 G4double HadrontherapyPrimaryGeneratorAction::GetmeanKineticEnergy(void)
 { return meanKineticEnergy;}
+