Modifications to MFT classes to manage embedding

diff --git a/MFT/AliMFT.cxx b/MFT/AliMFT.cxx
index 0b1e35a6fd772f82c5405c768c88a173bc6bc20b..38e295abbc9828ae03f5d58efba61fc6c32c252b 100644 (file)
--- a/MFT/AliMFT.cxx
+++ b/MFT/AliMFT.cxx
@@ -63,11 +63,18 @@ AliMFT::AliMFT():
   fChargeDispersion(25.e-4),
   fSingleStepForChargeDispersion(0),
   fNStepForChargeDispersion(4),
-  fDensitySupportOverSi(0.15)
+  fDensitySupportOverSi(0.15),
+  fFileNameForUnderyingEvent(0), 
+  fFileNameForPileUpEvents(0),
+  fNPileUpEvents(0), 
+  fUnderlyingEventID(-1)
 {
 
   // default constructor
 
+  for (Int_t iPileUp=0; iPileUp<AliMFTConstants::fNMaxPileUpEvents; iPileUp++) fPileUpEventsIDs[iPileUp] = -1;
+
+
 }
 
 //====================================================================================================================================================
@@ -86,9 +93,15 @@ AliMFT::AliMFT(const Char_t *name, const Char_t *title):
   fChargeDispersion(25.e-4),
   fSingleStepForChargeDispersion(0),
   fNStepForChargeDispersion(4),
-  fDensitySupportOverSi(0.15)
+  fDensitySupportOverSi(0.15),
+  fFileNameForUnderyingEvent(0), 
+  fFileNameForPileUpEvents(0),
+  fNPileUpEvents(0), 
+  fUnderlyingEventID(-1)
 {
 
+  for (Int_t iPileUp=0; iPileUp<AliMFTConstants::fNMaxPileUpEvents; iPileUp++) fPileUpEventsIDs[iPileUp] = -1;
+
   fNameGeomFile = "AliMFTGeometry.root";
 
   SetGeometry();
@@ -113,9 +126,15 @@ AliMFT::AliMFT(const Char_t *name, const Char_t *title, Char_t *nameGeomFile):
   fChargeDispersion(25.e-4),
   fSingleStepForChargeDispersion(0),
   fNStepForChargeDispersion(4),
-  fDensitySupportOverSi(0.15)
+  fDensitySupportOverSi(0.15),
+  fFileNameForUnderyingEvent(0), 
+  fFileNameForPileUpEvents(0),
+  fNPileUpEvents(0), 
+  fUnderlyingEventID(-1)
 {
 
+  for (Int_t iPileUp=0; iPileUp<AliMFTConstants::fNMaxPileUpEvents; iPileUp++) fPileUpEventsIDs[iPileUp] = -1;
+
   fNameGeomFile = nameGeomFile;
 
   SetGeometry();

diff --git a/MFT/AliMFT.h b/MFT/AliMFT.h
index fb3e50f7c758c36244e6660358e8eb2480cf56b2..ae612135b0bb78c2d754067b624bedcb8d01bfc2 100644 (file)
--- a/MFT/AliMFT.h
+++ b/MFT/AliMFT.h
@@ -102,6 +102,19 @@ public:
 
   void SetDensitySupportOverSi(Double_t density) { if (density>1e-6) fDensitySupportOverSi=density; else fDensitySupportOverSi=1e-6; }
 
+  //--------- for underlying and pile-up events --------------------
+
+  void SetFileNameForUnderlyingEvent(TString fileName) { fFileNameForUnderyingEvent += fileName; }
+  void SetFileNameForPileUpEvents(TString fileName)    { fFileNameForPileUpEvents   += fileName; }
+
+  void SetUnderlyingEventID(Short_t eventID) { fUnderlyingEventID = eventID; }
+  void SetPileUpEventID(Short_t i, Short_t eventID) { if (i>=0 && i<AliMFTConstants::fNMaxPileUpEvents) fPileUpEventsIDs[i] = eventID; }
+
+  const Char_t* GetFileNameForUnderlyingEvent() { return fFileNameForUnderyingEvent; }
+  const Char_t* GetFileNameForPileUpEvents()    { return fFileNameForPileUpEvents; }
+  Short_t GetUnderlyingEventID() { return fUnderlyingEventID; }
+  Short_t GetPileUpEventID(Short_t i) { if (i>=0 && i<AliMFTConstants::fNMaxPileUpEvents) return fPileUpEventsIDs[i]; else return -1; }
+  
 protected:
 
   static const Int_t fNMaxPlanes = AliMFTConstants::fNMaxPlanes;        // max number of MFT planes
@@ -125,13 +138,16 @@ protected:
   Int_t fNStepForChargeDispersion;
 
   Double_t fDensitySupportOverSi;
+
+  TString fFileNameForUnderyingEvent, fFileNameForPileUpEvents;
+  Short_t fNPileUpEvents, fUnderlyingEventID, fPileUpEventsIDs[AliMFTConstants::fNMaxPileUpEvents];
   
 private:
 
   AliMFT (const AliMFT& mft);             // dummy copy constructor
   AliMFT &operator=(const AliMFT& mft);   // dummy assignment operator
   
-  ClassDef(AliMFT,1) 
+  ClassDef(AliMFT,2) 
     
 };
 

diff --git a/MFT/AliMFTAnalysisTools.cxx b/MFT/AliMFTAnalysisTools.cxx
index abce117eba0a7ad021f6b47b8cd79a54c2b559c8..34fef4b7edd04b4022c762c8df8013299213fd10 100644 (file)
--- a/MFT/AliMFTAnalysisTools.cxx
+++ b/MFT/AliMFTAnalysisTools.cxx
@@ -31,6 +31,7 @@
 #include "TMath.h"
 #include "AliLog.h"
 #include "TObjArray.h"
+#include "TDecompLU.h"
 
 #include "AliMFTAnalysisTools.h"
 
@@ -152,16 +153,21 @@ Double_t AliMFTAnalysisTools::GetAODMuonWeightedOffset(AliAODTrack *muon, Double
   covCoordinates(1,0) = cov(2,0);
   covCoordinates(1,1) = cov(2,2);
   
-  TMatrixD covCoordinatesInverse = covCoordinates.Invert();
+  if (TDecompLU::InvertLU(covCoordinates,covCoordinates.GetTol(),0)) {
 
-  Double_t dX = xy[0] - xv;
-  Double_t dY = xy[1] - yv;
-  
-  Double_t weightedOffset = TMath::Sqrt(0.5*(dX*dX*covCoordinatesInverse(0,0) + 
-                                            dY*dY*covCoordinatesInverse(1,1) + 
-                                            2.*dX*dY*covCoordinatesInverse(0,1)));
+    TMatrixD covCoordinatesInverse = covCoordinates;
+    Double_t dX = xy[0] - xv;
+    Double_t dY = xy[1] - yv;
+    
+    Double_t weightedOffset = TMath::Sqrt(0.5*(dX*dX*covCoordinatesInverse(0,0) +
+                                              dY*dY*covCoordinatesInverse(1,1) +
+                                              2.*dX*dY*covCoordinatesInverse(0,1)));
+    
+    return weightedOffset;
 
-  return weightedOffset;
+  }
+  
+  return -999;
 
 }
 

diff --git a/MFT/AliMFTConstants.h b/MFT/AliMFTConstants.h
index e96553d51f0a587ce698834a3177b2e80a67e9ea..1cbb3b4cffe3ca1ae1543e04b9b8761fee001e3b 100644 (file)
--- a/MFT/AliMFTConstants.h
+++ b/MFT/AliMFTConstants.h
@@ -58,13 +58,15 @@ public:
   static const Double_t fMisalignmentMagnitude;   // Expected misalignment magnitude (for MC, waiting for OCDB)
 
   static const Int_t fNMaxMuonsForPCA = 10;
+  static const Int_t fNMaxPileUpEvents = 5;         // Max events to consider for pile-up studies
+  static const Int_t fLabelOffsetMC = 10000000;     // Offset to be added to MC labels of tracks from merged underlying and pile-up events
 
 protected:
 
   AliMFTConstants() : TObject() {}
   virtual ~AliMFTConstants(){}
 
-  ClassDef(AliMFTConstants, 3)    // MFT global constants 
+  ClassDef(AliMFTConstants, 4)    // MFT global constants 
 
 };
        

diff --git a/MFT/AliMFTTrackerMU.cxx b/MFT/AliMFTTrackerMU.cxx
index 422bb9c1a43fd9c527fb8351525ddee523e3b1f6..0204c6eab8ce06533a84cf402925a2f45d8f476e 100644 (file)
--- a/MFT/AliMFTTrackerMU.cxx
+++ b/MFT/AliMFTTrackerMU.cxx
@@ -43,6 +43,7 @@
 #include "AliMUONESDInterface.h"
 #include "AliMuonForwardTrack.h"
 #include "AliMUONConstants.h"
+#include "TGrid.h"
 
 ClassImp(AliMFTTrackerMU)
 
@@ -132,6 +133,10 @@ Int_t AliMFTTrackerMU::LoadClusters(TTree *cTree) {
   for (Int_t iPlane=0; iPlane<fNPlanesMFT; iPlane++) {
     AliInfo(Form("plane %02d: nClusters = %d\n", iPlane, fMFTClusterArray[iPlane]->GetEntries()));
   }
+
+  AddClustersFromUnderlyingEvent();
+  AddClustersFromPileUpEvents();
+
   SeparateFrontBackClusters();
 
   return 0;
@@ -599,3 +604,102 @@ void AliMFTTrackerMU::GetVertexFromMC() {
 
 //======================================================================================================================================
 
+void AliMFTTrackerMU::AddClustersFromUnderlyingEvent() {
+
+  AliInfo("Adding clusters from underlying event");
+
+  if (!fMFT) return;
+
+  TGrid::Connect("alien://");
+
+  TFile* fileWithClustersToAdd = TFile::Open(fMFT->GetFileNameForUnderlyingEvent());
+  if (!fileWithClustersToAdd) return;
+  if (!(fileWithClustersToAdd->IsOpen())) return;
+  if (!(fileWithClustersToAdd->cd(Form("Event%d",fMFT->GetUnderlyingEventID())))) return;
+
+  TClonesArray *recPointsPerPlaneToAdd[AliMFTConstants::fNMaxPlanes] = {0};
+  TTree *treeIn = 0;
+
+  for (Int_t iPlane=0; iPlane<AliMFTConstants::fNMaxPlanes; iPlane++) recPointsPerPlaneToAdd[iPlane] = new TClonesArray("AliMFTCluster");
+
+  treeIn = (TTree*) gDirectory->Get("TreeR");
+
+  for (Int_t iPlane=0; iPlane<fNPlanesMFT; iPlane++) {
+    if (!(treeIn->GetBranch(Form("Plane_%02d",iPlane)))) {
+      for (Int_t jPlane=0; jPlane<AliMFTConstants::fNMaxPlanes; jPlane++) delete recPointsPerPlaneToAdd[jPlane];
+      return;
+    }
+    else treeIn->SetBranchAddress(Form("Plane_%02d",iPlane), &(recPointsPerPlaneToAdd[iPlane]));
+  }
+
+  treeIn -> GetEntry(0);
+
+  for (Int_t iPlane=0; iPlane<fNPlanesMFT; iPlane++) {
+    printf("plane %d -> before = %d ",iPlane,fMFTClusterArray[iPlane]->GetEntries());
+    Int_t nClusters = recPointsPerPlaneToAdd[iPlane]->GetEntries();
+    for (Int_t iCluster=0; iCluster<nClusters; iCluster++) {
+      AliMFTCluster *newCluster = (AliMFTCluster*) recPointsPerPlaneToAdd[iPlane]->At(iCluster);
+      for (Int_t iTrack=0; iTrack<newCluster->GetNMCTracks(); iTrack++) newCluster->SetMCLabel(iTrack, newCluster->GetMCLabel(iTrack)+AliMFTConstants::fLabelOffsetMC);
+      new ((*fMFTClusterArray[iPlane])[fMFTClusterArray[iPlane]->GetEntries()]) AliMFTCluster(*newCluster);
+    }
+    printf("after = %d\n",fMFTClusterArray[iPlane]->GetEntries());
+  }
+
+  for (Int_t jPlane=0; jPlane<AliMFTConstants::fNMaxPlanes; jPlane++) delete recPointsPerPlaneToAdd[jPlane];
+
+}
+
+//======================================================================================================================================
+
+void AliMFTTrackerMU::AddClustersFromPileUpEvents() {
+
+  AliInfo("Adding clusters from pile-up event(s)");
+
+  if (!fMFT) return;
+
+  TGrid::Connect("alien://");
+
+  TFile* fileWithClustersToAdd = TFile::Open(fMFT->GetFileNameForPileUpEvents());
+  if (!fileWithClustersToAdd) return;
+  if (!(fileWithClustersToAdd->IsOpen())) return;
+
+  TClonesArray *recPointsPerPlaneToAdd[AliMFTConstants::fNMaxPlanes] = {0};
+  TTree *treeIn = 0;
+
+  for (Int_t iPileUp=0; iPileUp<AliMFTConstants::fNMaxPileUpEvents; iPileUp++) {
+    
+    if (!(fileWithClustersToAdd->cd(Form("Event%d",fMFT->GetPileUpEventID(iPileUp))))) continue;
+    
+    for (Int_t iPlane=0; iPlane<AliMFTConstants::fNMaxPlanes; iPlane++) recPointsPerPlaneToAdd[iPlane] = new TClonesArray("AliMFTCluster");
+    
+    treeIn = (TTree*) gDirectory->Get("TreeR");
+    
+    for (Int_t iPlane=0; iPlane<fNPlanesMFT; iPlane++) {
+      if (!(treeIn->GetBranch(Form("Plane_%02d",iPlane)))) {
+       for (Int_t jPlane=0; jPlane<AliMFTConstants::fNMaxPlanes; jPlane++) delete recPointsPerPlaneToAdd[jPlane];
+       return;
+      }
+      else treeIn->SetBranchAddress(Form("Plane_%02d",iPlane), &(recPointsPerPlaneToAdd[iPlane]));
+    }
+
+    treeIn -> GetEntry(0);
+    
+    for (Int_t iPlane=0; iPlane<fNPlanesMFT; iPlane++) {
+      printf("plane %d -> before = %d ",iPlane,fMFTClusterArray[iPlane]->GetEntries());
+      Int_t nClusters = recPointsPerPlaneToAdd[iPlane]->GetEntries();
+      for (Int_t iCluster=0; iCluster<nClusters; iCluster++) {
+       AliMFTCluster *newCluster = (AliMFTCluster*) recPointsPerPlaneToAdd[iPlane]->At(iCluster);
+       for (Int_t iTrack=0; iTrack<newCluster->GetNMCTracks(); iTrack++) newCluster->SetMCLabel(iTrack, newCluster->GetMCLabel(iTrack)+AliMFTConstants::fLabelOffsetMC);
+       new ((*fMFTClusterArray[iPlane])[fMFTClusterArray[iPlane]->GetEntries()]) AliMFTCluster(*newCluster);
+      }
+      printf("after = %d\n",fMFTClusterArray[iPlane]->GetEntries());
+    }
+
+    for (Int_t jPlane=0; jPlane<AliMFTConstants::fNMaxPlanes; jPlane++) delete recPointsPerPlaneToAdd[jPlane];
+
+  }
+
+}
+
+//======================================================================================================================================
+

diff --git a/MFT/AliMFTTrackerMU.h b/MFT/AliMFTTrackerMU.h
index f4c0ddc2ebd0a5589e781bc58cbac401fdffc38b..310852a7ad679e9026066e7d981d3f2a4225b131 100644 (file)
--- a/MFT/AliMFTTrackerMU.h
+++ b/MFT/AliMFTTrackerMU.h
@@ -64,6 +64,8 @@ public:
   /// Dummy implementation
   virtual AliCluster *GetCluster(Int_t /*index*/) const {return 0;}
 
+  void AddClustersFromUnderlyingEvent();
+  void AddClustersFromPileUpEvents();
 
 protected: