Changeset 1315 for trunk/source/materials/src/G4MaterialPropertyVector.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/materials/src/G4MaterialPropertyVector.cc (modified) (5 diffs)

trunk/source/materials/src/G4MaterialPropertyVector.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4MaterialPropertyVector.cc,v 1.17 2009/04/21 15:35:45 gcosmo Exp $
-// GEANT4 tag $Name: materials-V09-02-18 $
+// $Id: G4MaterialPropertyVector.cc,v 1.18 2010/04/22 21:15:19 gum Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -154 +154 @@
 G4double G4MaterialPropertyVector::GetProperty(G4double aPhotonEnergy) const
 {
-  G4MPVEntry *target, *temp; 
   G4int left, right;
   G4double ratio1, ratio2, pmright, pmleft, InterpolatedValue;
@@ -175 +174 @@
     G4Exception("G4MaterialPropertyVector::GetProperty()", "OutOfRange",
                 JustWarning, "Attempt to retrieve property below range !");
+    G4cout << "   aPhotonEnergy = " <<  aPhotonEnergy/MeV 
+           << " [MeV]  PMmin = " << PMmin << " [MeV]" << G4endl;         
     return minProp; 
   } 
@@ -182 +183 @@
     G4Exception("G4MaterialPropertyVector::GetProperty()", "OutOfRange",
                 JustWarning, "Attempt to retrieve property above range !");
+    G4cout << "   aPhotonEnergy = " <<  aPhotonEnergy/MeV 
+           << " [MeV]  PMmax = " << PMmax << " [MeV]" << G4endl;         
     return maxProp;
   } 
-  
-  target = new G4MPVEntry(aPhotonEnergy, 0.0);
-
-  temp = 0;
-  //temp = MPV.find(target);
-  std::vector<G4MPVEntry*>::const_iterator i;
-  for (i = MPV.begin(); i != MPV.end(); i++)
-  {
-    if (**i == *target)  { temp = *i; break; }
-  }
-  if (temp != 0)
-  {
-    ////////////////////////
-    // Return actual value
-    ////////////////////////
-
-    G4double retval = temp->GetProperty();
-    delete target;
-    return retval;
-  }
-  else
-  {
-    //////////////////////////////
-    // Return interpolated value 
-    //////////////////////////////
-
-    GetAdjacentBins(aPhotonEnergy, &left, &right);
-
-    pmleft = MPV[left]->GetPhotonEnergy();
-    pmright = MPV[right]->GetPhotonEnergy();
-    ratio1 = (aPhotonEnergy-pmleft)/(pmright-pmleft);
-    ratio2 = 1 - ratio1;
-    InterpolatedValue = MPV[left]->GetProperty()*ratio2 + 
-                        MPV[right]->GetProperty()*ratio1;
-    delete target;
-    return InterpolatedValue;
-  }  
+
+  //////////////////////////////
+  // Return interpolated value 
+  //////////////////////////////
+
+  GetAdjacentBins(aPhotonEnergy, &left, &right);
+  pmleft = MPV[left]->GetPhotonEnergy();
+  pmright = MPV[right]->GetPhotonEnergy();
+  ratio1 = (aPhotonEnergy-pmleft)/(pmright-pmleft);
+  ratio2 = 1 - ratio1;
+  InterpolatedValue = MPV[left]->GetProperty()*ratio2 + 
+                      MPV[right]->GetProperty()*ratio1;
+  return InterpolatedValue;
 }
 
@@ -340 +319 @@
   {
     mid = (*left + *right)/2;
-    if (MPV[mid]->GetPhotonEnergy() < aPhotonEnergy) 
+    if (MPV[mid]->GetPhotonEnergy() <= aPhotonEnergy) 
     {
       *left = mid;