Changeset 991 for trunk/source/processes/electromagnetic/utils/src/G4EmConfigurator.cc

Timestamp:

Apr 17, 2009, 12:17:14 PM (15 years ago)

Author:

garnier

Message:

update

File:

• trunk/source/processes/electromagnetic/utils/src/G4EmConfigurator.cc (modified) (4 diffs)

trunk/source/processes/electromagnetic/utils/src/G4EmConfigurator.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmConfigurator.cc,v 1.4 2009/02/26 11:33:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4EmConfigurator.cc,v 1.3 2008/11/21 12:30:29 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // -------------------------------------------------------------------
@@ -117 +117 @@
   G4String fname = "";
   if(fm) fname = fm->GetName();
-  G4String mname = "";
-  if(mod) mname = mod->GetName();
-  AddModelForRegion(particleName, processName, mname, regionName,
+  AddModelForRegion(particleName, processName, mod->GetName(), regionName,
                     emin, emax, fname);
 }
@@ -205 +203 @@
 
         for(G4int i=0; i<nm; i++) {
-          G4String mname = "";
-          if(modelList[i]) mname = modelList[i]->GetName();
-          G4String fname = "";
-          if(flucModelList[i]) fname = flucModelList[i]->GetName();
-          if(modelName == mname && flucModelName == fname &&
+          if(modelName == modelList[i]->GetName() &&
              (particleList[i] == "" || particleList[i] == particleName) ) {
             mod  = modelList[i];
@@ -220 +214 @@
 
         if(!mod) {
-
-          // set fluctuation model for ionisation processes
-          if(fluc && ptype == eloss) {
-            G4VEnergyLossProcess* p = reinterpret_cast<G4VEnergyLossProcess*>(proc);
-            p->SetFluctModel(fluc);
-         
-          } else {
-            G4cout << "### G4EmConfigurator WARNING: fails to find a model <"
-                   << modelName << "> for process <" 
-                   << processName << "> and " << particleName 
-                   << G4endl;
-            if(flucModelName != "") {
-              G4cout << "                            fluctuation model <" 
-                     << flucModelName << G4endl;
-            }
-          }
+          G4cout << "### G4EmConfigurator WARNING: fails to find a model <"
+                 << modelName << "> for process <" 
+                 << processName << "> and " << particleName 
+                 << G4endl;
+          if(flucModelName != "")  
+            G4cout << "                            fluctuation model <" 
+                   << flucModelName << G4endl;
         } else {