Including St2 in the new geometry segmentation (Christian)

diff --git a/MUON/AliMUONClusterReconstructor.cxx b/MUON/AliMUONClusterReconstructor.cxx
index 3c12583..59bc2bc 100644 (file)
--- a/MUON/AliMUONClusterReconstructor.cxx
+++ b/MUON/AliMUONClusterReconstructor.cxx
@@ -271,7 +271,7 @@ void AliMUONClusterReconstructor::Digits2ClustersNew()
          }
        }
 
-       if (id[idDE] < 500 && id[idDE] > 299) continue; // temporary patch til St2 geometry is not yet ok (CF)
+       //      if (id[idDE] < 500 && id[idDE] > 299) continue; // temporary patch til St2 geometry is not yet ok (CF)
 
        // cluster finder
        if (fRecModel) {

diff --git a/MUON/AliMUONSt2GeometryBuilderV2.cxx b/MUON/AliMUONSt2GeometryBuilderV2.cxx
new file mode 100644 (file)
index 0000000..d1c2c43
--- /dev/null
+++ b/MUON/AliMUONSt2GeometryBuilderV2.cxx
@@ -0,0 +1,237 @@
+/**************************************************************************
+ * 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 AliMUONSt2GeometryBuilderV2
+// -------------------------------
+// MUON Station2 coarse geometry construction class.
+// Extracted from AliMUONv1
+
+
+#include <TVirtualMC.h>
+#include <TGeoMatrix.h>
+
+#include "AliLog.h"
+
+#include "AliMUONSt2GeometryBuilderV2.h"
+#include "AliMUON.h"
+#include "AliMUONChamber.h"
+#include "AliMUONGeometryModule.h"
+#include "AliMUONGeometryEnvelopeStore.h"
+
+ClassImp(AliMUONSt2GeometryBuilderV2)
+
+//______________________________________________________________________________
+AliMUONSt2GeometryBuilderV2::AliMUONSt2GeometryBuilderV2(AliMUON* muon)
+ : AliMUONVGeometryBuilder("st2.dat",
+                           muon->Chamber(2).GetGeometry(), 
+                          muon->Chamber(3).GetGeometry()),
+   fMUON(muon)
+{
+// Standard constructor
+
+}
+
+//______________________________________________________________________________
+AliMUONSt2GeometryBuilderV2::AliMUONSt2GeometryBuilderV2()
+ : AliMUONVGeometryBuilder(),
+   fMUON(0)
+{
+// Default constructor
+}
+
+
+//______________________________________________________________________________
+AliMUONSt2GeometryBuilderV2::AliMUONSt2GeometryBuilderV2(const AliMUONSt2GeometryBuilderV2& rhs)
+  : AliMUONVGeometryBuilder(rhs)
+{
+// Protected copy constructor
+
+  AliFatal("Copy constructor is not implemented.");
+}
+
+//______________________________________________________________________________
+AliMUONSt2GeometryBuilderV2::~AliMUONSt2GeometryBuilderV2() {
+//
+}
+
+//______________________________________________________________________________
+AliMUONSt2GeometryBuilderV2& 
+AliMUONSt2GeometryBuilderV2::operator = (const AliMUONSt2GeometryBuilderV2& rhs) 
+{
+// Protected assignement operator
+
+  // check assignement to self
+  if (this == &rhs) return *this;
+
+  AliFatal("Assignment operator is not implemented.");
+    
+  return *this;  
+}
+
+//
+// public methods
+//
+
+//______________________________________________________________________________
+void AliMUONSt2GeometryBuilderV2::CreateGeometry() 
+{
+// From AliMUONv1::CreateGeometry()
+
+//
+//********************************************************************
+//                            Station 2                             **
+//********************************************************************
+     // indices 1 and 2 for first and second chambers in the station
+     // iChamber (first chamber) kept for other quanties than Z,
+     // assumed to be the same in both chambers
+
+     // Get tracking medias Ids     
+     Int_t *idtmed = fMUON->GetIdtmed()->GetArray()-1099;
+     Int_t idAir= idtmed[1100]; // medium 1
+  //     Int_t idAlu1=idtmed[1103]; // medium 4
+     //     Int_t idAlu2=idtmed[1104]; // medium 5
+     Int_t idGas=idtmed[1108];  // medium 9 = Ar-CO2 gas (80%+20%)
+
+     const Float_t kDeltaQuad = 2.6;
+     const Float_t kDeltaZ = 6.5/2.;
+
+     // Rotation matrices in the x-y plane  
+     // phi= 0 deg
+     Int_t irot1;
+     fMUON->AliMatrix(irot1,  90.,   0., 90.,  90., 0., 0.);
+     // phi= 90 deg
+     Int_t irot2;
+     fMUON->AliMatrix(irot2,  90.,  90., 90., 180., 0., 0.);
+
+     AliMUONChamber* iChamber = &fMUON->Chamber(2);
+     //     AliMUONChamber* iChamber1 = iChamber;
+     //     AliMUONChamber* iChamber2 = &fMUON->Chamber(3);
+     
+     // Half of the total thickness of frame crosses (including DAlu)
+     // for each chamber in stations 1 and 2:
+     // 3% of X0 of composite material,
+     // but taken as Aluminium here, with same thickness in number of X0
+     //     Float_t dframez = 3. * 8.9 / 100;
+     // DGas and DAlu not changed from standard values
+     //     Double_t zfpos=-(iChamber->DGas()+dframez+iChamber->DAlu())/2;
+             // The same parameters are defined in builder for station 1 
+     
+     // Mother volume
+     // Outer excess and inner recess for mother volume radius
+     // with respect to ROuter and RInner
+     //     Float_t dframep=.001; // Value for station 3 should be 6 ...
+     // Width (RdPhi) of the frame crosses for stations 1 and 2 (cm)
+     // Float_t dframep1=.001;
+     //     Float_t phi=2*TMath::Pi()/12/2;
+             // The same parameters are defined in builder for station 1 (30deg)
+
+     Float_t tpar[5];
+     //     Double_t dstation = (-iChamber2->Z()) - (-iChamber1->Z());
+
+
+     Float_t posx, posy, posz;
+//   Chamber Material represented by Alu sheet
+     tpar[0]= iChamber->RInner();
+     tpar[1]= iChamber->ROuter();
+     tpar[2] = (iChamber->DGas())/2;
+     tpar[3] = 0.;
+     tpar[4] = 90.;
+  
+//     
+//   Sensitive volumes
+     gMC->Gsvolu("S03G", "TUBS", idGas, tpar, 5);
+     gMC->Gsvolu("S04G", "TUBS", idGas, tpar, 5);
+
+     Int_t detElemId;
+
+     posx = kDeltaQuad;
+     posy = kDeltaQuad;
+     posz = kDeltaZ;
+
+     detElemId = 300;
+     gMC->Gsvolu("LE01", "TUBS", idAir, tpar, 5);
+     GetEnvelopes(2)->AddEnvelope("LE01", detElemId, true, TGeoTranslation(posx, posy, posz),
+                                  TGeoRotation("rot1",90,0,90,90,0,0) );
+     detElemId = 400;
+     gMC->Gsvolu("LF01", "TUBS", idAir, tpar, 5);
+     GetEnvelopes(3)->AddEnvelope("LF01", detElemId, true, TGeoTranslation(posx, posy, posz),
+                                  TGeoRotation("rot1",90,0,90,90,0,0) );
+     detElemId = 351;
+     gMC->Gsvolu("LE02", "TUBS", idAir, tpar, 5);
+     GetEnvelopes(2)->AddEnvelope("LE02", detElemId, true, TGeoTranslation(-posx, posy,-posz),
+                                 TGeoRotation("rot2",90,180,90,90,180,0) );
+     detElemId = 451;
+     gMC->Gsvolu("LF02", "TUBS", idAir, tpar, 5);
+     GetEnvelopes(3)->AddEnvelope("LF02", detElemId, true, TGeoTranslation(-posx, posy,-posz),
+                                 TGeoRotation("rot2",90,180,90,90,180,0) );
+     detElemId = 301;
+     gMC->Gsvolu("LE03", "TUBS", idAir, tpar, 5);
+     GetEnvelopes(2)->AddEnvelope("LE03", detElemId, true, TGeoTranslation(posx, -posy, -posz),
+                                 TGeoRotation("rot3",90,0,90,270,180,0) );
+     detElemId = 401;
+     gMC->Gsvolu("LF03", "TUBS", idAir, tpar, 5);
+     GetEnvelopes(3)->AddEnvelope("LF03", detElemId, true, TGeoTranslation(posx, -posy, -posz),
+                                 TGeoRotation("rot3",90,0,90,270,180,0) );
+     detElemId = 350;
+     gMC->Gsvolu("LE04", "TUBS", idAir, tpar, 5);
+     GetEnvelopes(2)->AddEnvelope("LE04", detElemId, true, TGeoTranslation(-posx, -posy, posz),
+                                 TGeoRotation("rot4",90,180,90,270,0,0) );
+     detElemId = 450;
+     gMC->Gsvolu("LF04", "TUBS", idAir, tpar, 5);
+     GetEnvelopes(3)->AddEnvelope("LF04", detElemId, true, TGeoTranslation(-posx, -posy, posz),
+                                 TGeoRotation("rot4",90,180,90,270,0,0) );
+
+     GetEnvelopes(2)->AddEnvelopeConstituent("S03G", "LE01", 1);
+     GetEnvelopes(3)->AddEnvelopeConstituent("S04G", "LF01", 1);
+
+     GetEnvelopes(2)->AddEnvelopeConstituent("S03G", "LE02", 2);
+     GetEnvelopes(3)->AddEnvelopeConstituent("S04G", "LF02", 2);
+
+     GetEnvelopes(2)->AddEnvelopeConstituent("S03G", "LE03", 3);
+     GetEnvelopes(3)->AddEnvelopeConstituent("S04G", "LF03", 3);
+
+     GetEnvelopes(2)->AddEnvelopeConstituent("S03G", "LE04", 4);
+     GetEnvelopes(3)->AddEnvelopeConstituent("S04G", "LF04", 4);
+
+}
+
+//______________________________________________________________________________
+void AliMUONSt2GeometryBuilderV2::SetTransformations()
+{
+// Defines the transformations for the station2 chambers.
+// ---
+
+  AliMUONChamber* iChamber1 = &fMUON->Chamber(2);
+  Double_t zpos1 = - iChamber1->Z(); 
+  iChamber1->GetGeometry()
+    ->SetTranslation(TGeoTranslation(0., 0., zpos1));
+
+  AliMUONChamber* iChamber2 = &fMUON->Chamber(3);
+  Double_t zpos2 = - iChamber2->Z(); 
+  iChamber2->GetGeometry()
+    ->SetTranslation(TGeoTranslation(0., 0., zpos2));
+}
+
+//______________________________________________________________________________
+void AliMUONSt2GeometryBuilderV2::SetSensitiveVolumes()
+{
+// Defines the sensitive volumes for station2 chambers.
+// ---
+
+  GetGeometry(2)->SetSensitiveVolume("S03G");
+  GetGeometry(3)->SetSensitiveVolume("S04G");
+}

diff --git a/MUON/AliMUONSt2GeometryBuilderV2.h b/MUON/AliMUONSt2GeometryBuilderV2.h
new file mode 100644 (file)
index 0000000..6fb4b63
--- /dev/null
+++ b/MUON/AliMUONSt2GeometryBuilderV2.h
@@ -0,0 +1,44 @@
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+// $Id$
+// Revision of includes 07/05/2004
+//
+// Class AliMUONSt2GeometryBuilderV2
+// -----------------------------
+// MUON Station2 geometry construction class.
+//
+// Author: Ivana Hrivnacova, IPN Orsay
+
+#ifndef ALI_MUON_ST2_GEOMETRY_BUILDER_V2_H
+#define ALI_MUON_ST2_GEOMETRY_BUILDER_V2_H
+
+#include "AliMUONVGeometryBuilder.h"
+
+class AliMUON;
+
+class AliMUONSt2GeometryBuilderV2 : public AliMUONVGeometryBuilder
+{
+  public:
+    AliMUONSt2GeometryBuilderV2(AliMUON* muon);
+    AliMUONSt2GeometryBuilderV2();
+    virtual ~AliMUONSt2GeometryBuilderV2();
+  
+    // methods
+    virtual void CreateGeometry();
+    virtual void SetTransformations();
+    virtual void SetSensitiveVolumes();
+    
+  protected:
+    AliMUONSt2GeometryBuilderV2(const AliMUONSt2GeometryBuilderV2& rhs);
+
+    // operators  
+    AliMUONSt2GeometryBuilderV2& operator = (const AliMUONSt2GeometryBuilderV2& rhs);
+    
+  private:
+     AliMUON*  fMUON; // the MUON detector class 
+        
+  ClassDef(AliMUONSt2GeometryBuilderV2,1) // MUON chamber geometry base class
+};
+
+#endif //ALI_MUON_ST2_GEOMETRY_BUILDER_H_V2

diff --git a/MUON/MUONbaseLinkDef.h b/MUON/MUONbaseLinkDef.h
index 17d4edc..faeeb8b 100644 (file)
--- a/MUON/MUONbaseLinkDef.h
+++ b/MUON/MUONbaseLinkDef.h
@@ -33,6 +33,7 @@
 #pragma link C++ class AliMUONSt1GeometryBuilder+; 
 #pragma link C++ class AliMUONSt1GeometryBuilderV2+; 
 #pragma link C++ class AliMUONSt2GeometryBuilder+; 
+#pragma link C++ class AliMUONSt2GeometryBuilderV2+; 
 #pragma link C++ class AliMUONSlatGeometryBuilder+; 
 #pragma link C++ class AliMUONTriggerGeometryBuilder+; 
 // info classes 

diff --git a/MUON/libMUONbase.pkg b/MUON/libMUONbase.pkg
index c7277ed..e7b1c23 100644 (file)
--- a/MUON/libMUONbase.pkg
+++ b/MUON/libMUONbase.pkg
@@ -24,6 +24,7 @@ SRCS:=  AliMUON.cxx AliMUONv1.cxx \
         AliMUONSt1GeometryBuilder.cxx \
         AliMUONSt1GeometryBuilderV2.cxx \
         AliMUONSt2GeometryBuilder.cxx \
+        AliMUONSt2GeometryBuilderV2.cxx \
         AliMUONSlatGeometryBuilder.cxx \
         AliMUONTriggerGeometryBuilder.cxx \
         AliMUONConstants.cxx \