Updated MFT geometry and cluster information

diff --git a/MFT/AliMFT.cxx b/MFT/AliMFT.cxx
index 9445b0d1eab7b881db17c91215d1e67af360b529..a88417ec83c38dfa1112f645694fc400feff6c61 100644 (file)
--- a/MFT/AliMFT.cxx
+++ b/MFT/AliMFT.cxx
@@ -63,7 +63,7 @@ AliMFT::AliMFT():
   fChargeDispersion(25.e-4),
   fSingleStepForChargeDispersion(0),
   fNStepForChargeDispersion(4),
-  fDensitySupportOverSi(0.05),
+  fDensitySupportOverSi(0.036),
   fFileNameForUnderyingEvent(0), 
   fFileNameForPileUpEvents(0),
   fNPileUpEvents(0), 
@@ -93,7 +93,7 @@ AliMFT::AliMFT(const Char_t *name, const Char_t *title):
   fChargeDispersion(25.e-4),
   fSingleStepForChargeDispersion(0),
   fNStepForChargeDispersion(4),
-  fDensitySupportOverSi(0.05),
+  fDensitySupportOverSi(0.036),
   fFileNameForUnderyingEvent(0), 
   fFileNameForPileUpEvents(0),
   fNPileUpEvents(0), 
@@ -126,7 +126,7 @@ AliMFT::AliMFT(const Char_t *name, const Char_t *title, Char_t *nameGeomFile):
   fChargeDispersion(25.e-4),
   fSingleStepForChargeDispersion(0),
   fNStepForChargeDispersion(4),
-  fDensitySupportOverSi(0.05),
+  fDensitySupportOverSi(0.036),
   fFileNameForUnderyingEvent(0), 
   fFileNameForPileUpEvents(0),
   fNPileUpEvents(0), 

diff --git a/MFT/AliMFTCluster.cxx b/MFT/AliMFTCluster.cxx
index a764cd35945f245ced5fede4c751e877d8be4a2c..3f18ebf73f94fab41b9f989a881bbeb2471c9e73 100644 (file)
--- a/MFT/AliMFTCluster.cxx
+++ b/MFT/AliMFTCluster.cxx
@@ -48,7 +48,8 @@ AliMFTCluster::AliMFTCluster():
   fTrackChi2(0),
   fLocalChi2(0),
   fDigitsInCluster(0),
-  fIsClusterEditable(kTRUE)
+  fIsClusterEditable(kTRUE),
+  fIsClusterFront(kTRUE)
 {
 
   // default constructor
@@ -77,7 +78,8 @@ AliMFTCluster::AliMFTCluster(const AliMFTCluster& cluster):
   fTrackChi2(cluster.fTrackChi2),
   fLocalChi2(cluster.fLocalChi2),
   fDigitsInCluster(NULL),
-  fIsClusterEditable(cluster.fIsClusterEditable)
+  fIsClusterEditable(cluster.fIsClusterEditable),
+  fIsClusterFront(cluster.fIsClusterFront)
 {
 
   // copy constructor
@@ -122,6 +124,7 @@ AliMFTCluster& AliMFTCluster::operator=(const AliMFTCluster& cluster) {
   fTrackChi2         = cluster.fTrackChi2;
   fLocalChi2         = cluster.fLocalChi2;
   fIsClusterEditable = cluster.fIsClusterEditable;
+  fIsClusterFront    = cluster.fIsClusterFront;
 
   for (Int_t iTrack=0; iTrack<fNMaxMCTracks; iTrack++) fMCLabel[iTrack] = (cluster.fMCLabel)[iTrack];
   fDigitsInCluster      = new TClonesArray(*(cluster.fDigitsInCluster));

diff --git a/MFT/AliMFTCluster.h b/MFT/AliMFTCluster.h
index 7015349ad5901411eacb7d584cc0aad4973a5d4b..f01d3488f7714383e6656c6c79ce313daae88b8e 100644 (file)
--- a/MFT/AliMFTCluster.h
+++ b/MFT/AliMFTCluster.h
@@ -86,6 +86,9 @@ public:
 
   Double_t GetDistanceFromPixel(AliMFTDigit *pixel);
 
+  void SetClusterFront(Bool_t clusterFront) { if(fIsClusterEditable) fIsClusterFront = clusterFront; }
+  Bool_t IsClusterFront() { return fIsClusterFront; }
+
   AliMUONRawCluster* CreateMUONCluster();
   
 private:
@@ -108,7 +111,7 @@ private:
   
   TClonesArray *fDigitsInCluster;   //! (Temporary) Array of the digits composing the cluster
 
-  Bool_t fIsClusterEditable;
+  Bool_t fIsClusterEditable, fIsClusterFront;
 
   ClassDef(AliMFTCluster, 1)
 

diff --git a/MFT/AliMFTClusterFinder.cxx b/MFT/AliMFTClusterFinder.cxx
index f09aa007bbcf426e775c4f93b610b901f4500d9c..c56361ecdf07267463a945efd5f4df89f902c595 100644 (file)
--- a/MFT/AliMFTClusterFinder.cxx
+++ b/MFT/AliMFTClusterFinder.cxx
@@ -230,12 +230,15 @@ void AliMFTClusterFinder::DigitsToClusters(const TObjArray *pDigitList) {
       for (Int_t iCluster=0; iCluster<clustersPerDetElem[iDetElem]->GetEntries(); iCluster++) {
        newCluster = (AliMFTCluster*) (clustersPerDetElem[iDetElem]->At(iCluster));
        newCluster -> TerminateCluster();
+       newCluster -> SetClusterEditable(kTRUE);
+       if (TMath::Abs(newCluster->GetZ())<TMath::Abs(fSegmentation->GetPlane(iPlane)->GetZCenter())) newCluster->SetClusterFront(kTRUE);
+       else                                                                                          newCluster->SetClusterFront(kFALSE);
        if (fApplyMisalignment) {
-         newCluster -> SetClusterEditable(kTRUE);
          newCluster -> SetX(newCluster->GetX()+misalignmentX);
          newCluster -> SetY(newCluster->GetY()+misalignmentY);
-         newCluster -> SetClusterEditable(kFALSE);
        }
+       newCluster -> SetClusterEditable(kFALSE);
+
        new ((*fClustersPerPlane[iPlane])[fClustersPerPlane[iPlane]->GetEntries()]) AliMFTCluster(*newCluster);
       }
     }

diff --git a/MFT/AliMFTGeometry.root b/MFT/AliMFTGeometry.root
index 8b0007dc9469fb6abe42dc5463084761eaba16f0..9b93593725b06b3d4d4d3d6ebd2f6a243e9a58ff 100644 (file)
Binary files a/MFT/AliMFTGeometry.root and b/MFT/AliMFTGeometry.root differ

diff --git a/MFT/SetMFTGeometry.C b/MFT/SetMFTGeometry.C
index 119f600be10932ba57cbfafa55849a495b277f18..d5cd48b4afcb6f32c095fa4c8c26e186416395f3 100644 (file)
--- a/MFT/SetMFTGeometry.C
+++ b/MFT/SetMFTGeometry.C
@@ -19,7 +19,7 @@ void SetMFTGeometry() {
   const Float_t pixelSizeY[nPlanes]       = { 28.e-4,  28.e-4,  28.e-4,  28.e-4,  28.e-4 };   // expressed in cm
 
   const Float_t thicknessActive[nPlanes]  = {  50.e-4,   50.e-4,   50.e-4,   50.e-4,   50.e-4 };   // expressed in cm
-  const Float_t thicknessSupport[nPlanes] = {   1.   ,    1.   ,    1.   ,    1.   ,    1.    };   // expressed in cm
+  const Float_t thicknessSupport[nPlanes] = {   1.4  ,    1.4  ,    1.4  ,    1.4  ,    1.4   };   // expressed in cm
   const Float_t thicknessReadout[nPlanes] = {  50.e-4,   50.e-4,   50.e-4,   50.e-4,   50.e-4 };   // expressed in cm
 
   const Float_t equivalentSilicon[nPlanes]            = { 600.e-4, 600.e-4, 600.e-4, 600.e-4, 600.e-4 };    // expressed in cm