Import Geant4 9.1.0 source tree

examples/extended/electromagnetic/TestEm12/src/DetectorConstruction.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: DetectorConstruction.cc,v 1.2 2006/06/29 16:43:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/DetectorMessenger.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:43:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/EventAction.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: EventAction.cc,v 1.2 2006/06/29 16:43:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/EventActionMessenger.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: EventActionMessenger.cc,v 1.2 2006/06/29 16:43:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/HistoManager.cc

@@ -23,8 +23,8 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: HistoManager.cc,v 1.4 2007/04/27 10:38:11 maire Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// $Id: HistoManager.cc,v 1.6 2007/11/09 17:35:06 maire Exp $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -61,12 +61,13 @@ HistoManager::HistoManager()
     exist[k] = false;
     Unit[k]  = 1.0;
     Width[k] = 1.0;
+    ascii[k] = false;    
   }
 
   histoMessenger = new HistoMessenger(this);
   
-  csdaRange = 0.;
-  stepMax   = DBL_MAX;
+  rangeFlag = false;  
+  csdaRange = DBL_MAX;    
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -82,7 +83,7 @@ HistoManager::~HistoManager()
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-void HistoManager::book(G4double range)
+void HistoManager::book()
 {
 #ifdef G4ANALYSIS_USE
   if(!af) return;
@@ -121,8 +122,6 @@ void HistoManager::book(G4double range)
   if (factoryOn) 
      G4cout << "\n----> Histogram Tree is opened in " << fileName[1] << G4endl;
 #endif
-
-if (csdaRange == 0.) csdaRange = range;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -131,6 +130,7 @@ void HistoManager::save()
 {
 #ifdef G4ANALYSIS_USE
   if (factoryOn) {
+    saveAscii();          // Write ascii file, if any   
     tree->commit();       // Writing the histograms to the file
     tree->close();        // and closing the tree (and the file)
     G4cout << "\n----> Histogram Tree is saved in " << fileName[1] << G4endl;
@@ -202,19 +202,6 @@ void HistoManager::SetHisto(G4int ih,
   G4cout << "----> SetHisto " << ih << ": " << titl << ";  "
          << nbins << " bins from "
          << vmin << " " << unit << " to " << vmax << " " << unit << G4endl;
-	 
-  // compute constraint of stepMax from histos 1 and 8
-  //
-  G4double frac = 1.;
-  if (ih == 1) {
-    stepMax = std::min(stepMax,frac*Width[ih]);
-    G4cout << "      stepMax = " << G4BestUnit(stepMax,"Length") << G4endl;
-  }
-     	 
-  if ((ih == 8)&&(csdaRange>0.)) {
-    stepMax = std::min(stepMax,frac*Width[ih]*csdaRange);
-    G4cout << "      stepMax = " << G4BestUnit(stepMax,"Length") << G4endl;
-  }   	 
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -246,3 +233,68 @@ void HistoManager::Scale(G4int ih, G4double fac)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
+void HistoManager::PrintHisto(G4int ih)
+{
+ if (ih < MaxHisto) ascii[ih] = true;
+ else
+    G4cout << "---> warning from HistoManager::PrintHisto() : histo " << ih
+           << "does not exist" << G4endl;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+#include <fstream>
+
+void HistoManager::saveAscii()
+{
+#ifdef G4ANALYSIS_USE
+ 
+ G4String name = fileName[0] + ".ascii";
+ std::ofstream File(name, std::ios::out);
+ File.setf( std::ios::scientific, std::ios::floatfield );
+ 
+ //write selected histograms
+ for (G4int ih=0; ih<MaxHisto; ih++) {
+    if (exist[ih] && ascii[ih]) {
+      File << "\n  1D histogram " << ih << ": " << Title[ih] 
+           << "\n \n \t     X \t\t     Y" << G4endl;
+     
+      for (G4int iBin=0; iBin<Nbins[ih]; iBin++) {
+         File << "  " << iBin << "\t" 
+              << histo[ih]->binMean(iBin) << "\t"
+	      << histo[ih]->binHeight(iBin) 
+	      << G4endl;
+      } 
+    }
+ }
+#endif
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+G4double HistoManager::ComputeStepMax(G4double range)
+{
+  // compute constraint on stepMax from histos 1 and 8
+  //
+  G4double stepMax = DBL_MAX;
+  G4double frac = 1.;
+  
+  G4int ih = 1;
+  if (exist[ih]) {
+    stepMax = frac*Width[ih];    
+  }
+  
+  ih = 8;   	 
+  if (exist[ih]) {
+    if (!rangeFlag) csdaRange = range;
+    if (csdaRange > 0.) stepMax = std::min(stepMax,frac*Width[ih]*csdaRange);
+  }
+  
+  G4cout << "\n---> stepMax from HistoManager = " 
+         << G4BestUnit(stepMax,"Length") << G4endl;
+	 
+  return stepMax;     	   
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+

examples/extended/electromagnetic/TestEm12/src/HistoMessenger.cc

@@ -23,8 +23,8 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: HistoMessenger.cc,v 1.3 2006/06/29 16:43:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// $Id: HistoMessenger.cc,v 1.4 2007/11/09 17:35:06 maire Exp $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -83,6 +83,11 @@ HistoMessenger::HistoMessenger(HistoManager* manager)
   unit->SetDefaultValue("none");
   histoCmd->SetParameter(unit);
   
+  prhistoCmd = new G4UIcmdWithAnInteger("/testem/histo/printHisto",this);
+  prhistoCmd->SetGuidance("print histo #id on ascii file");
+  prhistoCmd->SetParameterName("id",false);
+  prhistoCmd->SetRange("id>0");
+   
   rmhistoCmd = new G4UIcmdWithAnInteger("/testem/histo/removeHisto",this);
   rmhistoCmd->SetGuidance("desactivate histo  #id");
   rmhistoCmd->SetParameterName("id",false);
@@ -101,6 +106,7 @@ HistoMessenger::~HistoMessenger()
 {
   delete csdaCmd; 
   delete rmhistoCmd;
+  delete prhistoCmd;  
   delete histoCmd;
   delete typeCmd;  
   delete factoryCmd;
@@ -127,6 +133,9 @@ void HistoMessenger::SetNewValue(G4UIcommand* command, G4String newValues)
      if (unit != "none") vUnit = G4UIcommand::ValueOf(unit);
      histoManager->SetHisto (ih,nbBins,vmin*vUnit,vmax*vUnit,unit);
    }
+   
+  if (command == prhistoCmd)
+    histoManager->PrintHisto(prhistoCmd->GetNewIntValue(newValues));
     
   if (command == rmhistoCmd)
     histoManager->RemoveHisto(rmhistoCmd->GetNewIntValue(newValues));

examples/extended/electromagnetic/TestEm12/src/PhysListEmLivermore.cc

@@ -25,7 +25,7 @@
 //
 //
 // $Id: PhysListEmLivermore.cc,v 1.3 2007/01/08 16:33:52 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... 

examples/extended/electromagnetic/TestEm12/src/PhysListEmPenelope.cc

@@ -25,7 +25,7 @@
 //
 //
 // $Id: PhysListEmPenelope.cc,v 1.2 2006/06/29 16:43:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... 

examples/extended/electromagnetic/TestEm12/src/PhysListEmStandard.cc

@@ -25,7 +25,7 @@
 //
 //
 // $Id: PhysListEmStandard.cc,v 1.2 2006/06/29 16:43:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... 

examples/extended/electromagnetic/TestEm12/src/PhysicsList.cc

@@ -23,8 +23,8 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: PhysicsList.cc,v 1.5 2006/10/25 17:27:02 maire Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// $Id: PhysicsList.cc,v 1.6 2007/08/19 20:57:28 maire Exp $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -292,7 +292,7 @@ void PhysicsList::SetCuts()
     G4cout << "PhysicsList::SetCuts:";
     G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << G4endl;
   }
-
+  
   // set cut values for gamma at first and for e- second and next for e+,
   // because some processes for e+/e- need cut values for gamma
   SetCutValue(cutForGamma, "gamma");

examples/extended/electromagnetic/TestEm12/src/PhysicsListMessenger.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 16:43:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorAction.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:43:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorMessenger.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: PrimaryGeneratorMessenger.cc,v 1.2 2006/06/29 16:43:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/RunAction.cc

@@ -23,8 +23,8 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: RunAction.cc,v 1.7 2007/04/27 10:38:11 maire Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// $Id: RunAction.cc,v 1.8 2007/08/19 20:57:29 maire Exp $
+// GEANT4 tag $Name: geant4-09-01 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -89,17 +89,17 @@ void RunAction::BeginOfRunAction(const G4Run* aRun)
   G4ParticleDefinition* particle = kinematic->GetParticleGun()
                                           ->GetParticleDefinition();
   G4double energy = kinematic->GetParticleGun()->GetParticleEnergy();
-  csdaRange = 0.;
+  csdaRange = DBL_MAX;
   if (particle->GetPDGCharge() != 0.)
     csdaRange = emCalculator.GetCSDARange(energy,particle,material);
-    		    
+     		    
   //histograms
   //
-  histoManager->book(csdaRange);
+  histoManager->book();
   
   //set StepMax from histos
   //
-  G4double stepMax = histoManager->GetStepMax();
+  G4double stepMax = histoManager->ComputeStepMax(csdaRange);
   physics->GetStepMaxProcess()->SetMaxStep(stepMax);
 }
 

examples/extended/electromagnetic/TestEm12/src/StepMax.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: StepMax.cc,v 1.3 2006/06/29 16:43:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/StepMaxMessenger.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: StepMaxMessenger.cc,v 1.3 2006/06/29 16:43:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/SteppingAction.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: SteppingAction.cc,v 1.4 2007/04/27 10:38:11 maire Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/SteppingVerbose.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:43:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/electromagnetic/TestEm12/src/TrackingAction.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: TrackingAction.cc,v 1.2 2006/06/29 16:43:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00 $
+// GEANT4 tag $Name: geant4-09-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......