Changeset 962 for trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScattering.cc

Timestamp:

Apr 6, 2009, 12:30:29 PM (15 years ago)

Author:

garnier

Message:

update processes

File:

• trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScattering.cc (modified) (5 diffs)

trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScattering.cc

@@ -39 +39 @@
 
 // 070625 Fix memory leaking at destructor by T. Koi 
+// 081201 Fix memory leaking at destructor by T. Koi 
 
 #include "G4NeutronHPThermalScattering.hh"
@@ -103 +104 @@
 {
 
-   { // separate name scope of it 
-   std::map < G4int , std::map < G4double , std::vector < E_isoAng* >* >* >::iterator it;
-   for ( it = incoherentFSs.begin() ; it != incoherentFSs.end() ; it++ )
+   for ( std::map < G4int , std::map < G4double , std::vector < E_isoAng* >* >* >::iterator it = incoherentFSs.begin() ; it != incoherentFSs.end() ; it++ )
    {
       std::map < G4double , std::vector < E_isoAng* >* >::iterator itt;
@@ -119 +118 @@
       delete it->second;
    }
-   }
-
-   {
-   std::map < G4int , std::map < G4double , std::vector < std::pair< G4double , G4double >* >* >* >::iterator it;
-   for ( it = coherentFSs.begin() ; it != coherentFSs.end() ; it++ )
+
+   for ( std::map < G4int , std::map < G4double , std::vector < std::pair< G4double , G4double >* >* >* >::iterator it = coherentFSs.begin() ; it != coherentFSs.end() ; it++ )
    {
       std::map < G4double , std::vector < std::pair< G4double , G4double >* >* >::iterator itt;
@@ -137 +133 @@
       delete it->second;
    }
-   }
-
-   {
-   std::map < G4int ,  std::map < G4double , std::vector < E_P_E_isoAng* >* >* >::iterator it;
-   for ( it = inelasticFSs.begin() ; it != inelasticFSs.end() ; it++ )
+
+   for ( std::map < G4int ,  std::map < G4double , std::vector < E_P_E_isoAng* >* >* >::iterator it = inelasticFSs.begin() ; it != inelasticFSs.end() ; it++ )
    {
       std::map < G4double , std::vector < E_P_E_isoAng* >* >::iterator itt;
@@ -160 +153 @@
       delete it->second;
    }
-   }
-
+
+   delete theHPElastic;
    delete theXSection;
 }