GPS2 geometry removed

diff --git a/PHOS/AliPHOSGeometry.cxx b/PHOS/AliPHOSGeometry.cxx
index a68745cb14e41c919f6d06bc8b103f9e2f079d53..bde9dd2639d4e7d4be4fe05792bb76442bfd54b2 100644 (file)
--- a/PHOS/AliPHOSGeometry.cxx
+++ b/PHOS/AliPHOSGeometry.cxx
@@ -65,12 +65,10 @@ void AliPHOSGeometry::Init(void)
 {
   // Initializes the PHOS parameters :
   //  IHEP is the Protvino CPV (cathode pad chambers)
-  //  GPS2 is the Subatech Pre-Shower (two micromegas sandwiching a passive lead converter)
-  //  MIXT 4 PHOS modules withe the IHEP CPV and one PHOS module with the Subatech Pre-Shower
   
   TString test(GetName()) ; 
-  if (test != "IHEP" && test != "GPS2" && test != "MIXT") {
-    Fatal("Init", "%s is not a known geometry (choose among IHEP, GPS2 and MIXT)", test.Data() ) ; 
+  if (test != "IHEP" ) {
+    Fatal("Init", "%s is not a known geometry (choose among IHEP)", test.Data() ) ; 
   }
 
   fgInit     = kTRUE ; 

diff --git a/PHOS/AliPHOSv0.h b/PHOS/AliPHOSv0.h
index d1a23ae0bbacdd4d267aca61779d9ad9d18924d3..e828d539873b77ae07ea25615e57c00a9d456b4a 100644 (file)
--- a/PHOS/AliPHOSv0.h
+++ b/PHOS/AliPHOSv0.h
@@ -5,7 +5,6 @@
 
 //_________________________________________________________________________
 // Implementation version v0 of PHOS Manager class 
-// Layout EMC + PPSD has name GPS2  
 // Layout EMC + CPV  has name IHEP
 //*--                  
 //*-- Author: Yves Schutz (SUBATECH)

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index eea1795b5af15e34c89de7b1f899cf31f5ccbabb..5f08ca9036e6f8a2605a26135f2ce772fdeea955 100644 (file)
--- a/PHOS/AliPHOSv1.h
+++ b/PHOS/AliPHOSv1.h
@@ -5,7 +5,6 @@
 
 //_________________________________________________________________________
 // Implementation version v1 of PHOS Manager class 
-// Layout EMC + PPSD has name GPS2  
 // Layout EMC + CPV  has name IHEP
 //*--                  
 //*-- Author: Yves Schutz (SUBATECH)

diff --git a/PHOS/AliPHOSv3.cxx b/PHOS/AliPHOSv3.cxx
index d8050c9231e0bc959b279b294cf1150f39d1b16f..156710aedc658b9e333effc2dd34fbf9e960b9ea 100644 (file)
--- a/PHOS/AliPHOSv3.cxx
+++ b/PHOS/AliPHOSv3.cxx
@@ -17,7 +17,6 @@
 
 //_________________________________________________________________________
 // Implementation version v0 of PHOS Manager class 
-// Layout EMC + PPSD has name GPS2  
 // The main goal of this version of AliPHOS is to calculte the 
 //  induced charged in the PIN diode, taking into account light
 //  tracking in the PbWO4 crystal, induced signal in the 
@@ -136,40 +135,7 @@ void AliPHOSv3::StepManager(void)
   Float_t        local[3] ;
 
 
-  if ( name == "GPS2" || name == "MIXT" ) {            // ======> CPV is a GPS' PPSD
-
-    if( gMC->CurrentVolID(copy) == gMC->VolId("PPCE") ) // We are inside a gas cell 
-    {
-      gMC->TrackPosition(pos) ;
-      xyze[0] = pos[0] ;
-      xyze[1] = pos[1] ;
-      xyze[2] = pos[2] ;
-      xyze[3] = gMC->Edep() ; 
-
-      if ( xyze[3] != 0) { // there is deposited energy 
-               gMC->CurrentVolOffID(5, relid[0]) ;  // get the PHOS Module number
-       if ( name == "MIXT" && strcmp(gMC->CurrentVolOffName(5),"PHO1") == 0 ){
-         relid[0] += GetGeometry()->GetNModules() - GetGeometry()->GetNPPSDModules();
-       }
-               gMC->CurrentVolOffID(3, relid[1]) ;  // get the Micromegas Module number 
-      // 1-> GetGeometry()->GetNumberOfModulesPhi() * GetGeometry()->GetNumberOfModulesZ() upper
-      //   > GetGeometry()->GetNumberOfModulesPhi() * GetGeometry()->GetNumberOfModulesZ() lower
-               gMC->CurrentVolOffID(1, relid[2]) ;  // get the row number of the cell
-        gMC->CurrentVolID(relid[3]) ;        // get the column number 
-
-       // get the absolute Id number
-
-               GetGeometry()->RelToAbsNumbering(relid, absid) ; 
-
-       // add current hit to the hit list      
-         AddHit(fIshunt, primary, tracknumber, absid, xyze);
-
-
-      } // there is deposited energy 
-    } // We are inside the gas of the CPV  
-  } // GPS2 configuration
-
-  if ( name == "IHEP" || name == "MIXT" ) {       // ======> CPV is a IHEP's one
+  if ( name == "IHEP" ) {       // ======> CPV is a IHEP's one
 
     // Yuri Kharlov, 28 September 2000
 
@@ -284,9 +250,6 @@ if(gMC->CurrentVolID(copy)==gMC->VolId("PXTL")){// We are inside a PBWO4 crystal
 
       gMC->CurrentVolOffID(10, relid[0]) ; // get the PHOS module number ;
 
-      if ( name == "MIXT" && strcmp(gMC->CurrentVolOffName(10),"PHO1") == 0 )
-       relid[0] += GetGeometry()->GetNModules() - GetGeometry()->GetNPPSDModules();      
-
       relid[1] = 0   ;                    // means PBW04
    gMC->CurrentVolOffID(4, relid[2]) ; // get the row number inside the module
    gMC->CurrentVolOffID(3, relid[3]) ; // get the cell number inside the module

diff --git a/PHOS/AliPHOSv3.h b/PHOS/AliPHOSv3.h
index 25983702a8990c22960cd6cb96de6fd7887fcf6c..f64935eb2a85795f59c9b43738a1dadb15cf46e0 100644 (file)
--- a/PHOS/AliPHOSv3.h
+++ b/PHOS/AliPHOSv3.h
@@ -5,7 +5,6 @@
 
 //_________________________________________________________________________
 // Implementation version v1 of PHOS Manager class 
-// Layout EMC + PPSD has name GPS2  
 // The main goal of this version of AliPHOS is to calculte the 
 //  induced charged in the PIN diode, taking into account light
 //  tracking in the PbWO4 crystal, induced signal in the 

diff --git a/PHOS/AliPHOSvImpacts.cxx b/PHOS/AliPHOSvImpacts.cxx
index e698cfb7e543d0d4d8ce8026afb466b81744036c..3cae449e928328487768036804534d90e82ce10c 100644 (file)
--- a/PHOS/AliPHOSvImpacts.cxx
+++ b/PHOS/AliPHOSvImpacts.cxx
@@ -191,8 +191,8 @@ void AliPHOSvImpacts::StepManager(void)
   TLorentzVector pos      ;           // Lorentz vector of the track current position
   Int_t          copy     ;
 
-  Int_t tracknumber =  gAlice->GetCurrentTrackNumber() ; 
-  Int_t primary     =  gAlice->GetPrimary( gAlice->GetCurrentTrackNumber() ); 
+  Int_t tracknumber =  gAlice->CurrentTrack() ; 
+  Int_t primary     =  gAlice->GetPrimary( gAlice->CurrentTrack() ); 
   TString name      =  GetGeometry()->GetName() ; 
 
   // Add impact to EMC