Changeset 1342 for trunk/examples/extended/electromagnetic/TestEm8/src

Timestamp:

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

Author:

garnier

Message:

update ti head

Location:

trunk/examples/extended/electromagnetic/TestEm8/src

Files:

• PhysicsList.cc (modified) (8 diffs)
• PhysicsListMessenger.cc (modified) (5 diffs)

trunk/examples/extended/electromagnetic/TestEm8/src/PhysicsList.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-//
-// $Id: PhysicsList.cc,v 1.19 2010/06/04 17:08:15 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: PhysicsList.cc,v 1.21 2010/10/27 14:52:07 vnivanch Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
+//
+//---------------------------------------------------------------------------
+//
+// ClassName:   PhysicsList
+//
+// Description: EM physics with a possibility to add PAI model
+//
+// Author:      V.Ivanchenko 01.09.2010
+//
+//----------------------------------------------------------------------------
 //
 
@@ -39 +48 @@
 #include "G4EmStandardPhysics_option2.hh"
 #include "G4EmStandardPhysics_option3.hh"
+#include "G4EmLivermorePhysics.hh"
+#include "G4EmPenelopePhysics.hh"
 #include "G4DecayPhysics.hh"
 
@@ -47 +58 @@
 #include "G4Electron.hh"
 #include "G4Positron.hh"
+#include "G4Proton.hh"
 
 #include "G4UnitsTable.hh"
@@ -67 +79 @@
   cutForElectron  = defaultCutValue;
   cutForPositron  = defaultCutValue;
-
-  stepMaxProcess  = 0;
+  cutForProton    = defaultCutValue;
 
   pMessenger = new PhysicsListMessenger(this);
+
+  stepMaxProcess = new StepMax();
 
   // Decay Physics is always defined
@@ -140 +153 @@
     emPhysicsList = new G4EmStandardPhysics_option3();
 
+  } else if (name == "emlivermore") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new G4EmLivermorePhysics();
+
+  } else if (name == "empenelope") {
+
+    emName = name;
+    delete emPhysicsList;
+    emPhysicsList = new G4EmPenelopePhysics();
+
   } else if (name == "pai") {
 
@@ -163 +188 @@
 {
   // Step limitation seen as a process
-  stepMaxProcess = new StepMax();
 
   theParticleIterator->reset();
@@ -195 +219 @@
   SetCutValue(cutForElectron, "e-");
   SetCutValue(cutForPositron, "e+");
+  SetCutValue(cutForProton, "proton");
 
   if ( verboseLevel > 0 ) { DumpCutValuesTable(); }
@@ -221 +246 @@
   cutForPositron = cut;
   SetParticleCuts(cutForPositron, G4Positron::Positron());
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+void PhysicsList::SetCutForProton(G4double cut)
+{
+  cutForPositron = cut;
+  SetParticleCuts(cutForProton, G4Proton::Proton());
 }
 

trunk/examples/extended/electromagnetic/TestEm8/src/PhysicsListMessenger.cc

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: PhysicsListMessenger.cc,v 1.3 2010/09/08 09:12:10 vnivanch Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
-// $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 17:00:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+//---------------------------------------------------------------------------
 //
+// ClassName:   PhysicsListMessenger
+//
+// Description: EM physics with a possibility to add PAI model
+//
+// Author:      V.Ivanchenko 01.09.2010
+//
+//----------------------------------------------------------------------------
 // 
 
@@ -38 +46 @@
 #include "G4UIcmdWithADoubleAndUnit.hh"
 #include "G4UIcmdWithAString.hh"
+#include "G4UIcmdWithAnInteger.hh"
+#include "HistoManager.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -44 +54 @@
 :pPhysicsList(pPhys)
 {   
-  gammaCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setGCut",this);  
-  gammaCutCmd->SetGuidance("Set gamma cut.");
-  gammaCutCmd->SetParameterName("Gcut",false);
-  gammaCutCmd->SetUnitCategory("Length");
-  gammaCutCmd->SetRange("Gcut>0.0");
-  gammaCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
+  eCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setMaxE",this);  
+  eCmd->SetGuidance("Set max energy deposit");
+  eCmd->SetParameterName("Emax",false);
+  eCmd->SetUnitCategory("Energy");
+  eCmd->SetRange("Emax>0.0");
+  eCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
 
-  electCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setECut",this);  
-  electCutCmd->SetGuidance("Set electron cut.");
-  electCutCmd->SetParameterName("Ecut",false);
-  electCutCmd->SetUnitCategory("Length");
-  electCutCmd->SetRange("Ecut>0.0");
-  electCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
+  ebCmd = new G4UIcmdWithAnInteger("/testem/phys/setNbinsE",this);  
+  ebCmd->SetGuidance("Set number of bins in energy.");
+  ebCmd->SetParameterName("Ebins",false);
+  ebCmd->SetRange("Ebins>0");
+  ebCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
   
-  protoCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setPCut",this);  
-  protoCutCmd->SetGuidance("Set positron cut.");
-  protoCutCmd->SetParameterName("Pcut",false);
-  protoCutCmd->SetUnitCategory("Length");
-  protoCutCmd->SetRange("Pcut>0.0");
-  protoCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle);  
-
-  allCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setCuts",this);  
-  allCutCmd->SetGuidance("Set cut for all.");
-  allCutCmd->SetParameterName("cut",false);
-  allCutCmd->SetUnitCategory("Length");
-  allCutCmd->SetRange("cut>0.0");
-  allCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle);  
+  cbCmd = new G4UIcmdWithAnInteger("/testem/phys/setNbinsCl",this);  
+  cbCmd->SetGuidance("Set max number of clusters.");
+  cbCmd->SetParameterName("Cbins",false);
+  cbCmd->SetRange("Cbins>0");
+  cbCmd->AvailableForStates(G4State_PreInit,G4State_Idle);  
 
   pListCmd = new G4UIcmdWithAString("/testem/phys/addPhysics",this);  
@@ -82 +83 @@
 PhysicsListMessenger::~PhysicsListMessenger()
 {
-  delete gammaCutCmd;
-  delete electCutCmd;
-  delete protoCutCmd;
-  delete allCutCmd;
+  delete eCmd;
+  delete ebCmd;
+  delete cbCmd;
   delete pListCmd;
 }
@@ -94 +94 @@
                                           G4String newValue)
 {       
-  if( command == gammaCutCmd )
-   { pPhysicsList->SetCutForGamma(gammaCutCmd->GetNewDoubleValue(newValue));}
+  HistoManager* man = HistoManager::GetPointer();
+  if( command == eCmd )
+   { man->SetMaxEnergy(eCmd->GetNewDoubleValue(newValue));}
      
-  if( command == electCutCmd )
-   { pPhysicsList->SetCutForElectron(electCutCmd->GetNewDoubleValue(newValue));}
+  if( command == ebCmd )
+   { man->SetNumberBins(ebCmd->GetNewIntValue(newValue));}
      
-  if( command == protoCutCmd )
-   { pPhysicsList->SetCutForPositron(protoCutCmd->GetNewDoubleValue(newValue));}
-
-  if( command == allCutCmd )
-    {
-      G4double cut = allCutCmd->GetNewDoubleValue(newValue);
-      pPhysicsList->SetCutForGamma(cut);
-      pPhysicsList->SetCutForElectron(cut);
-      pPhysicsList->SetCutForPositron(cut);
-    } 
+  if( command == cbCmd )
+   { man->SetNumberBinsCluster(cbCmd->GetNewIntValue(newValue));}
 
   if( command == pListCmd )