- Remove double declaration in Digitizer

[u/mrichter/AliRoot.git] / MUON / AliMUONSt1GeometryBuilder.cxx

diff --git a/MUON/AliMUONSt1GeometryBuilder.cxx b/MUON/AliMUONSt1GeometryBuilder.cxx
index b6e6a5f7532a1c272ba64661a6657a1dafbfa3c2..832e4d464b278f1809596a53dc421288097907a3 100644 (file)
--- a/MUON/AliMUONSt1GeometryBuilder.cxx
+++ b/MUON/AliMUONSt1GeometryBuilder.cxx
@@ -1,3 +1,18 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
 // $Id$
 //
 // Class AliMUONSt1GeometryBuilder
@@ -10,16 +25,21 @@
 #include <TVirtualMC.h>
 #include <TGeoMatrix.h>
 
+#include "AliLog.h"
+
 #include "AliMUONSt1GeometryBuilder.h"
 #include "AliMUON.h"
 #include "AliMUONChamber.h"
-#include "AliMUONChamberGeometry.h"
+#include "AliMUONGeometryModule.h"
+#include "AliMUONGeometryEnvelopeStore.h"
 
 ClassImp(AliMUONSt1GeometryBuilder)
 
 //______________________________________________________________________________
 AliMUONSt1GeometryBuilder::AliMUONSt1GeometryBuilder(AliMUON* muon)
- : AliMUONVGeometryBuilder(&muon->Chamber(0), &muon->Chamber(1)),
+ : AliMUONVGeometryBuilder("st1.dat",
+                           muon->Chamber(0).GetGeometry(), 
+                          muon->Chamber(1).GetGeometry()),
    fMUON(muon)
 {
 // Standard constructor
@@ -39,8 +59,9 @@ AliMUONSt1GeometryBuilder::AliMUONSt1GeometryBuilder()
 AliMUONSt1GeometryBuilder::AliMUONSt1GeometryBuilder(const AliMUONSt1GeometryBuilder& rhs)
   : AliMUONVGeometryBuilder(rhs)
 {
-  Fatal("Copy constructor", 
-        "Copy constructor is not implemented.");
+// Protected copy constructor
+
+  AliFatal("Copy constructor is not implemented.");
 }
 
 //______________________________________________________________________________
@@ -52,11 +73,12 @@ AliMUONSt1GeometryBuilder::~AliMUONSt1GeometryBuilder() {
 AliMUONSt1GeometryBuilder& 
 AliMUONSt1GeometryBuilder::operator = (const AliMUONSt1GeometryBuilder& rhs) 
 {
+// Protected assignement operator
+
   // check assignement to self
   if (this == &rhs) return *this;
 
-  Fatal("operator=", 
-        "Assignment operator is not implemented.");
+  AliFatal("Assignment operator is not implemented.");
     
   return *this;  
 }
@@ -95,8 +117,8 @@ void AliMUONSt1GeometryBuilder::CreateGeometry()
      Int_t irot2;
      fMUON->AliMatrix(irot2,  90.,  90., 90., 180., 0., 0.);
 
-     AliMUONChamber* iChamber1 = GetChamber(0);
-     AliMUONChamber* iChamber2 = GetChamber(1);
+     AliMUONChamber* iChamber1 = &fMUON->Chamber(0);
+     AliMUONChamber* iChamber2 = &fMUON->Chamber(1);
      AliMUONChamber* iChamber = iChamber1;
 
      // DGas decreased from standard one (0.5)
@@ -137,9 +159,11 @@ void AliMUONSt1GeometryBuilder::CreateGeometry()
 
      // CHANGED
      //gMC->Gspos("S01M", 1, "ALIC", 0., 0., zpos1 , 0, "ONLY");
-     //gMC->Gspos("S02M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY");     
-     GetChamber(0)->GetGeometry()->AddEnvelope("S01M", false);
-     GetChamber(1)->GetGeometry()->AddEnvelope("S02M", false);
+     //gMC->Gspos("S02M", 1, "ALIC", 0., 0., zpos2 , 0, "ONLY");
+     
+     GetEnvelopes(0)->AddEnvelope("S01M", 100, false);
+     GetEnvelopes(1)->AddEnvelope("S02M", 200, false);
+         
 
 // // Aluminium frames
 // // Outer frames
@@ -277,12 +301,12 @@ void AliMUONSt1GeometryBuilder::SetTransformations()
 // Defines the transformations for the station2 chambers.
 // ---
 
-  AliMUONChamber* iChamber1 = GetChamber(0);
+  AliMUONChamber* iChamber1 = &fMUON->Chamber(0);
   Double_t zpos1= - iChamber1->Z(); 
   iChamber1->GetGeometry()
     ->SetTranslation(TGeoTranslation(0., 0., zpos1));
 
-  AliMUONChamber* iChamber2 = GetChamber(1);
+  AliMUONChamber* iChamber2 = &fMUON->Chamber(1);
   Double_t zpos2 = - iChamber2->Z(); 
   iChamber2->GetGeometry()
     ->SetTranslation(TGeoTranslation(0., 0., zpos2));
@@ -294,6 +318,6 @@ void AliMUONSt1GeometryBuilder::SetSensitiveVolumes()
 // Defines the sensitive volumes for station1 chambers.
 // ---
 
-  GetChamber(0)->GetGeometry()->SetSensitiveVolume("S01G");
-  GetChamber(1)->GetGeometry()->SetSensitiveVolume("S02G");
+  GetGeometry(0)->SetSensitiveVolume("S01G");
+  GetGeometry(1)->SetSensitiveVolume("S02G");
 }