Import Geant4 10.4.0.beta source tree

2017-06-30 10:49:55 +02:00
parent 3a5407696b
commit 1a1316fea4
2180 changed files with 237880 additions and 59109 deletions
@@ -234,12 +234,15 @@ throw G4HadronicException(__FILE__, __LINE__, "Channel: Do not know what to do w
  G4ParticleHPInelastic::~G4ParticleHPInelastic()
  {
 //    delete [] theInelastic;
-     if ( theInelastic != NULL ) {
-        for ( std::vector<G4ParticleHPChannelList*>::iterator 
-              it = theInelastic->begin() ; it != theInelastic->end() ; it++ ) {
-           delete *it;
+    //Vector is shared, only master deletes
+    if ( !G4Threading::IsWorkerThread() ) {
+        if ( theInelastic != NULL ) {
+            for ( std::vector<G4ParticleHPChannelList*>::iterator
+                it = theInelastic->begin() ; it != theInelastic->end() ; it++ ) {
+                delete *it;
+            }
+            theInelastic->clear();
        }
-        theInelastic->clear();
     }
  }