Initialize decayer before generation. Important if run inside cocktail.

[u/mrichter/AliRoot.git] / AliGeant4 / AliModuleConstruction.cxx

diff --git a/AliGeant4/AliModuleConstruction.cxx b/AliGeant4/AliModuleConstruction.cxx
index a9da9bc92fa2a9fab487917b64e17369cebbd8d4..eb7685b09fef7978d2b9700c4113f8072ef8d354 100644 (file)
--- a/AliGeant4/AliModuleConstruction.cxx
+++ b/AliGeant4/AliModuleConstruction.cxx
@@ -4,8 +4,10 @@
 // See the class description in the header file.
 
 #include "AliModuleConstruction.h"
+#include "AliModuleConstructionMessenger.h"
 #include "AliGlobals.h"
 #include "AliLVStructure.h"
+#include "AliModule.h"
 
 #ifdef ALICE_VISUALIZE
 #include "AliColourStore.h"
@@ -16,8 +18,6 @@
 #include <G4LogicalVolumeStore.hh>
 #include <G4LogicalVolume.hh>
 
-#include <fstream.h>
-
 AliModuleConstruction::AliModuleConstruction(G4String moduleName) 
   : fModuleName(moduleName), 
     fModuleFrameName(moduleName),
@@ -283,7 +283,13 @@ void AliModuleConstruction::SetVolumeVisibility(G4LogicalVolume* lv,
 
   if (lv) {
     const G4VisAttributes* kpVisAttributes = lv->GetVisAttributes ();
-    G4VisAttributes* newVisAttributes = new G4VisAttributes(kpVisAttributes); 
+    G4VisAttributes* newVisAttributes; 
+    if (kpVisAttributes) {
+      G4Colour oldColour   = kpVisAttributes->GetColour();
+      newVisAttributes = new G4VisAttributes(oldColour); 
+    }  
+    else
+      newVisAttributes = new G4VisAttributes();
     delete kpVisAttributes;
 
     newVisAttributes->SetVisibility(visibility); 
@@ -331,9 +337,10 @@ void AliModuleConstruction::SetVolumeColour(G4LogicalVolume* lv,
 
   if (lv) {
     const G4VisAttributes* kpVisAttributes = lv->GetVisAttributes ();
-    G4VisAttributes* newVisAttributes = new G4VisAttributes(kpVisAttributes); 
     delete kpVisAttributes;
 
+    G4VisAttributes* newVisAttributes = new G4VisAttributes(); 
+
     AliColourStore* pColours = AliColourStore::Instance();
     const G4Colour kColour = pColours->GetColour(colName);
     newVisAttributes->SetVisibility(true);