Changeset 1192 for trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc

Timestamp:

Nov 19, 2009, 2:53:25 PM (15 years ago)

Author:

garnier

Message:

update par rapport a CVS

File:

• trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc (modified) (5 diffs)

trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4CrossSectionHandler.cc,v 1.18 2006/06/29 19:38:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4CrossSectionHandler.cc,v 1.21 2009/09/27 10:47:42 sincerti Exp $
+// GEANT4 tag $Name: emlowen-V09-02-64 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
@@ -35 +35 @@
 // 19 Jul 2002   VI         Create composite data set for material
 // 24 Apr 2003   VI         Cut per region mfpt
+//
+// 15 Jul 2009   Nicolas A. Karakatsanis
+//
+//                           - BuildCrossSectionForMaterials method was revised in order to calculate the 
+//                             logarithmic values of the loaded data. 
+//                             It retrieves the data values from the G4EMLOW data files but, then, calculates the
+//                             respective log values and loads them to seperate data structures.
+//                             The EM data sets, initialized this way, contain both non-log and log values.
+//                             These initialized data sets can enhance the computing performance of data interpolation
+//                             operations
 //
 // -------------------------------------------------------------------
@@ -66 +76 @@
   G4DataVector* data;
 
+  G4DataVector* log_energies;
+  G4DataVector* log_data;
+
   std::vector<G4VEMDataSet*>* matCrossSections = new std::vector<G4VEMDataSet*>;
 
@@ -95 +108 @@
         data = new G4DataVector;
 
+        log_energies = new G4DataVector;
+        log_data = new G4DataVector;
+
 
         for (size_t bin=0; bin<nOfBins; bin++)
@@ -100 +116 @@
             G4double e = energyVector[bin];
             energies->push_back(e);
+            if (e==0.) e=1e-300;
+            log_energies->push_back(std::log10(e));
             G4double cross = density*FindValue(Z,e);
             data->push_back(cross);
+            if (cross==0.) cross=1e-300;
+            log_data->push_back(std::log10(cross));
           }
 
         G4VDataSetAlgorithm* algo1 = interpolationAlgo->Clone();
-        G4VEMDataSet* elSet = new G4EMDataSet(i,energies,data,algo1,1.,1.);
+
+//      G4VEMDataSet* elSet = new G4EMDataSet(i,energies,data,algo1,1.,1.);
+
+        G4VEMDataSet* elSet = new G4EMDataSet(i,energies,data,log_energies,log_data,algo1,1.,1.);
+
         setForMat->AddComponent(elSet);
       }