fModuleConstructionVector type changed to vector of SingleModuleConstruction; IS0...

diff --git a/AliGeant4/AliModulesComposition.cxx b/AliGeant4/AliModulesComposition.cxx
index ce1a4b7861463fecef2fae1f88a28f2d5f80d3e7..b700db28fe7377ece220ca991c9f6fa00105c320 100644 (file)
--- a/AliGeant4/AliModulesComposition.cxx
+++ b/AliGeant4/AliModulesComposition.cxx
@@ -105,14 +105,14 @@ void AliModulesComposition::ConstructModules()
   G4int nofDets = fModuleConstructionVector.entries();
   for (G4int i=0; i<nofDets; i++) {
     G4cout << "Module " << fModuleConstructionVector[i]->GetDetName()
-           << " will be constructed now." << endl;
+           << " will be constructed now." << G4endl;
     fModuleConstructionVector[i]->Construct();
   }  
     
   // more modules construction
   G4int nofModules = fMoreModulesConstruction->GetNofModules();
   if (nofModules>0) {
-    G4cout << "Dependent modules will be constructed now." << endl;
+    G4cout << "Dependent modules will be constructed now." << G4endl;
     fMoreModulesConstruction->Construct();
   }  
 }  
@@ -165,16 +165,8 @@ void AliModulesComposition::SetAllLVSensitiveToModules(G4bool allSensitive)
   // single module constructions
   G4int nofDets = fModuleConstructionVector.entries();
   G4int i;
-  for (i=0; i<nofDets; i++) {
-    AliSingleModuleConstruction* moduleConstruction
-      = dynamic_cast<AliSingleModuleConstruction*>(fModuleConstructionVector[i]);
-    if (!moduleConstruction) {
-      G4String text = "AliModulesComposition::SetProcessConfig: \n";
-      text = text + "    Unknown module construction type.";
-      AliGlobals::Exception(text);
-    }      
-    moduleConstruction->SetAllLVSensitive(allSensitive);
-  }  
+  for (i=0; i<nofDets; i++)
+    fModuleConstructionVector[i]->SetAllLVSensitive(allSensitive);
 
   // more modules construction
   nofDets = fMoreModulesConstruction->GetNofModules();
@@ -193,16 +185,8 @@ void AliModulesComposition::SetProcessConfigToModules(G4bool processConfig)
   // single module constructions
   G4int nofDets = fModuleConstructionVector.entries();
   G4int i;
-  for (i=0; i<nofDets; i++) {
-    AliSingleModuleConstruction* moduleConstruction
-      = dynamic_cast<AliSingleModuleConstruction*>(fModuleConstructionVector[i]);
-    if (!moduleConstruction) {
-      G4String text = "AliModulesComposition::SetProcessConfig: \n";
-      text = text + "    Unknown module construction type.";
-      AliGlobals::Exception(text);
-    }      
-    moduleConstruction->SetProcessConfig(processConfig);
-  }  
+  for (i=0; i<nofDets; i++)
+    fModuleConstructionVector[i]->SetProcessConfig(processConfig);
   
   // more modules construction
   nofDets = fMoreModulesConstruction->GetNofModules();
@@ -312,9 +296,9 @@ void AliModulesComposition::PrintSwitchedDets() const
 
   G4String svList = GetSwitchedDetsList();
     
-  G4cout << "Switched Alice detectors: " << endl;
-  G4cout << "--------------------------" << endl;
-  G4cout << svList << endl;
+  G4cout << "Switched Alice detectors: " << G4endl;
+  G4cout << "--------------------------" << G4endl;
+  G4cout << svList << G4endl;
 }
 
 void AliModulesComposition::PrintAvailableDets() const
@@ -324,9 +308,9 @@ void AliModulesComposition::PrintAvailableDets() const
 
   G4String avList = GetAvailableDetsList();
     
-  G4cout << "Available Alice detectors: " << endl;
-  G4cout << "---------------------------" << endl;
-  G4cout << avList << endl;
+  G4cout << "Available Alice detectors: " << G4endl;
+  G4cout << "---------------------------" << G4endl;
+  G4cout << avList << G4endl;
 }
 
 G4String AliModulesComposition::GetSwitchedDetsList() const

diff --git a/AliGeant4/AliModulesComposition.h b/AliGeant4/AliModulesComposition.h
index 3db36795587b08f9b4a6df6bce401eb172f0ea7e..4777172e3097ca6f1f26228852a4045f65d29d5c 100644 (file)
--- a/AliGeant4/AliModulesComposition.h
+++ b/AliGeant4/AliModulesComposition.h
@@ -8,7 +8,7 @@
 #ifndef ALI_MODULES_COMPOSITION_H
 #define ALI_MODULES_COMPOSITION_H
 
-#include "AliModuleConstruction.h"
+#include "AliSingleModuleConstruction.h"
 #include "AliDetSwitch.h"
 #include "AliModuleType.h"
 
@@ -25,8 +25,9 @@ class G4VPhysicalVolume;
 
 class AliModulesComposition : public G4VUserDetectorConstruction
 {
-  typedef G4RWTPtrOrderedVector<AliDetSwitch>          AliDetSwitchVector;
-  typedef G4RWTPtrOrderedVector<AliModuleConstruction> AliModuleConstructionVector; 
+  typedef G4RWTPtrOrderedVector<AliDetSwitch>  AliDetSwitchRWVector;
+  typedef G4RWTPtrOrderedVector<AliSingleModuleConstruction>
+                                AliSingleModuleConstructionRWVector; 
 
   public:
     AliModulesComposition();
@@ -80,16 +81,19 @@ class AliModulesComposition : public G4VUserDetectorConstruction
     void SetAllLVSensitiveToModules(G4bool allSensitive);
 
     // data members
-    AliDetSwitchVector           fDetSwitchVector;          //vector of AliDetSwitch
-    AliModuleConstructionVector  fModuleConstructionVector; //vector of 
-                                                           //AliModuleConstruction 
-    AliMoreModulesConstruction*  fMoreModulesConstruction;  //AliMoreModulesConstruction
+    AliDetSwitchRWVector                fDetSwitchVector;          //..         
+                                          //vector of AliDetSwitch
+    AliSingleModuleConstructionRWVector fModuleConstructionVector; //..
+                                         //vector of 
+                                         //AliSingleModuleConstruction 
+    AliMoreModulesConstruction*         fMoreModulesConstruction;  //..
+                                          //AliMoreModulesConstruction
 
     AliMagneticField*                fMagneticField;  //magnetic field
     AliModulesCompositionMessenger*  fMessenger;      //messenger
-    G4bool                           fAllLVSensitive; //option applied to all modules
-    G4bool                           fReadGeometry;   //option applied to all modules
-    G4bool                           fWriteGeometry;  //option applied to all modules  
+    G4bool  fAllLVSensitive; //option applied to all modules
+    G4bool  fReadGeometry;   //option applied to all modules
+    G4bool  fWriteGeometry;  //option applied to all modules  
 };
 
 // inline methods