update for changes in Config.C

diff --git a/AliGeant4/macro/ITS/Config.C b/AliGeant4/macro/ITS/Config.C
index 1faa6435b7cfaa5a1ac9531ff0972b25cb81bf4e..415c3f5054ef65a7cae80ba77905bf76ea400f8a 100644 (file)
--- a/AliGeant4/macro/ITS/Config.C
+++ b/AliGeant4/macro/ITS/Config.C
@@ -4,17 +4,16 @@ void Config(Int_t version)
 
   AliITS* ITS = 0;
   switch (version) {
-    case 1: ITS  = new AliITSv1("ITS","Old ITS coarse version as of the ALICE TP"); break;
-    case 3: ITS  = new AliITSv3("ITS","Old ITS detailed version as of the ALICE TP"); break; 
-    case 5: ITS  = new AliITSv5("ITS","Current ITS detailed version used for the ITS TDR"); break;
-    case 6: ITS  = new AliITSv5symm( "ITS","Updated ITS TDR detailed version with symmetric services");break;
-    case 7: ITS  = new AliITSv5asymm("ITS","Updates ITS TDR detailed version with asymmetric services");break;
-    case 8: ITS  = new AliITSvPPRcoarseasymm("ITS","New ITS coarse version with asymmetric services"); break;
-    case 9: ITS  = new AliITSvPPRcoarsesymm( "ITS","New ITS coarse version with symmetric services"); break;
+    case 1: ITS  = new AliITSvPPRcoarseasymm("ITS","New ITS coarse version with asymmetric services"); break;
+    case 2: ITS  = new AliITSvPPRcoarsesymm("ITS","New ITS coarse version with symmetric services"); break;
+    case 3: ITS  = new AliITSvPPRasymm("ITS","New ITS PPR detailed version with asymmetric services"); break;
+    case 4: ITS  = new AliITSvPPRsymm("ITS","New ITS PPR detailed version with symmetric services"); break;
+    case 5: ITS  = new AliITSv5asymm("ITS","Updates ITS TDR detailed version with asymmetric services");break;
+    case 6: ITS  = new AliITSv5symm("ITS","Updated ITS TDR detailed version with symmetric services");break;
     // 
   }  
 
-    //=================== ITS parameters ============================
+//=================== ITS parameters ============================
     //
     // As the innermost detector in ALICE, the Inner Tracking System "impacts" on
     // almost all other detectors. This involves the fact that the ITS geometry
@@ -26,12 +25,8 @@ void Config(Int_t version)
     // ITS geometry you want to use and run Aliroot.
     //
     // Detailed geometries:         
-
-    //
     //
-    //AliITS *ITS  = new AliITSv3("ITS","Old ITS detailed version as of the ALICE TP");
     //
-    //AliITS *ITS  = new AliITSv5("ITS","Current ITS detailed version used for the ITS TDR");
     //
     //AliITS *ITS  = new AliITSv5symm("ITS","Updated ITS TDR detailed version with symmetric services");
     //
@@ -45,12 +40,11 @@ void Config(Int_t version)
     //ITS->SetThicknessDet2(300.);   // detector thickness on layer 2 must be in the range [100,300]
     //ITS->SetThicknessChip1(300.);  // chip thickness on layer 1 must be in the range [150,300]
     //ITS->SetThicknessChip2(300.);  // chip thickness on layer 2 must be in the range [150,300]
-    //ITS->SetRails(1);              // 1 --> rails in ; 0 --> rails out
-    //ITS->SetCoolingFluid(1);       // 1 --> water ; 0 --> freon
+    //ITS->SetRails(1);                   // 1 --> rails in ; 0 --> rails out
+    //ITS->SetCoolingFluid(1);    // 1 --> water ; 0 --> freon
     //
     //AliITSvPPRsymm *ITS  = new AliITSvPPRsymm("ITS","New ITS PPR detailed version with symmetric services");
-    //ITS->SetMinorVersion(2);                                  
-    
+    //ITS->SetMinorVersion(2);                                      
     //ITS->SetReadDet(kFALSE);
     //ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRsymm2.det");
     //ITS->SetThicknessDet1(300.);   // detector thickness on layer 1 must be in the range [100,300]
@@ -66,8 +60,6 @@ void Config(Int_t version)
     //                                                     
     //
     //
-    //AliITS *ITS  = new AliITSv1("ITS","Old ITS coarse version as of the ALICE TP");
-    //
     //AliITSvPPRcoarseasymm *ITS  = new AliITSvPPRcoarseasymm("ITS","New ITS coarse version with asymmetric services");
     //ITS->SetRails(1);                // 1 --> rails in ; 0 --> rails out
     //ITS->SetSupportMaterial(0);      // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon

diff --git a/AliGeant4/macro/STRUCT/ConfigFRAME.C b/AliGeant4/macro/STRUCT/ConfigFRAME.C
index 82d533f7bb6eca257da2843fcd90c41eb56116de..48c92869c95519453b70c9713b27ff1e58c845da 100644 (file)
--- a/AliGeant4/macro/STRUCT/ConfigFRAME.C
+++ b/AliGeant4/macro/STRUCT/ConfigFRAME.C
@@ -2,8 +2,9 @@ void Config(Int_t version)
 {
   AliFRAME* FRAME = 0;
   switch (version) {
-    case 0: FRAME = new AliFRAMEv0("FRAME","Space Frame");   break;
+    case 0: FRAME = new AliFRAMEv0("FRAME","FRAMEv0 module");   break;
     case 1: FRAME = new AliFRAMEv1("FRAME","FRAMEv1 module"); break;
+    case 2: FRAME = new AliFRAMEv2("FRAME","Space frame"); break;
   }  
 
 //=================== FRAME parameters ============================

diff --git a/AliGeant4/macro/g4Config.C b/AliGeant4/macro/g4Config.C
index e6ede2c8c98b493421a92495b321e5a01335ac5b..8009131698d9a762b5f39ac65d21b98c2e519e4f 100644 (file)
--- a/AliGeant4/macro/g4Config.C
+++ b/AliGeant4/macro/g4Config.C
@@ -197,12 +197,8 @@ void Config()
     // ITS geometry you want to use and run Aliroot.
     //
     // Detailed geometries:         
-
-    //
     //
-    //AliITS *ITS  = new AliITSv3("ITS","Old ITS detailed version as of the ALICE TP");
     //
-    //AliITS *ITS  = new AliITSv5("ITS","Current ITS detailed version used for the ITS TDR");
     //
     //AliITS *ITS  = new AliITSv5symm("ITS","Updated ITS TDR detailed version with symmetric services");
     //
@@ -216,12 +212,11 @@ void Config()
     //ITS->SetThicknessDet2(300.);   // detector thickness on layer 2 must be in the range [100,300]
     //ITS->SetThicknessChip1(300.);  // chip thickness on layer 1 must be in the range [150,300]
     //ITS->SetThicknessChip2(300.);  // chip thickness on layer 2 must be in the range [150,300]
-    //ITS->SetRails(1);              // 1 --> rails in ; 0 --> rails out
-    //ITS->SetCoolingFluid(1);       // 1 --> water ; 0 --> freon
+    //ITS->SetRails(1);                   // 1 --> rails in ; 0 --> rails out
+    //ITS->SetCoolingFluid(1);    // 1 --> water ; 0 --> freon
     //
     //AliITSvPPRsymm *ITS  = new AliITSvPPRsymm("ITS","New ITS PPR detailed version with symmetric services");
-    //ITS->SetMinorVersion(2);                                  
-    
+    //ITS->SetMinorVersion(2);                                      
     //ITS->SetReadDet(kFALSE);
     //ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRsymm2.det");
     //ITS->SetThicknessDet1(300.);   // detector thickness on layer 1 must be in the range [100,300]
@@ -237,8 +232,6 @@ void Config()
     //                                                     
     //
     //
-    //AliITS *ITS  = new AliITSv1("ITS","Old ITS coarse version as of the ALICE TP");
-    //
     //AliITSvPPRcoarseasymm *ITS  = new AliITSvPPRcoarseasymm("ITS","New ITS coarse version with asymmetric services");
     //ITS->SetRails(1);                // 1 --> rails in ; 0 --> rails out
     //ITS->SetSupportMaterial(0);      // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon