Improving method of track matching.

diff --git a/HLT/MUON/macros/MakeHitsTable.C b/HLT/MUON/macros/MakeHitsTable.C
index 685c3a7313c3ff06c9e7325ab2f95fea85437302..9c18686d3e7ccb076d68d2f8d7b52f10b4d8a912 100644 (file)
--- a/HLT/MUON/macros/MakeHitsTable.C
+++ b/HLT/MUON/macros/MakeHitsTable.C
@@ -52,7 +52,14 @@ using std::endl;
 void MakeHitsTable(
                Int_t firstEvent = 0,
                Int_t lastEvent = -1,
 void MakeHitsTable(
                Int_t firstEvent = 0,
                Int_t lastEvent = -1,

-               const char* dHLToutputfile = "output_0x00000000.root"
+               const char* dHLToutputfile = "output_0x00000000.root",
+               Float_t maxSigma = 4., // 4 standard deviations
+               Float_t sigmaX = 0.1,  // 1 mm resolution
+               Float_t sigmaY = 0.01, // 100 micron resolution
+               Float_t sigmaZ = 0.02,  // 200 microns resolution
+               Float_t sigmaXtrg = 0.5,  // 5 mm resolution
+               Float_t sigmaYtrg = 0.5,  // 5 mm resolution
+               Float_t sigmaZtrg = 0.02  // 2 microns resolution

        )
 {
        gSystem->Load("libAliHLTMUON.so");
        )
 {
        gSystem->Load("libAliHLTMUON.so");


@@ -184,7 +191,13 @@ void MakeHitsTable(
                                        continue;
                                TVector3 hV(hitX[ch][ti], hitY[ch][ti], hitZ[ch][ti]);
                                TVector3 diff = hV - hit->Coordinate();
                                        continue;
                                TVector3 hV(hitX[ch][ti], hitY[ch][ti], hitZ[ch][ti]);
                                TVector3 diff = hV - hit->Coordinate();

-                               Double_t fitQuality = diff.Mag2(); // Use the square of diff. More Chi^2 like properties.
+                               Double_t diffX = diff.X() / sigmaX;
+                               Double_t diffY = diff.Y() / sigmaY;
+                               Double_t diffZ = diff.Z() / sigmaZ;
+                               if (diffX > maxSigma) continue;
+                               if (diffY > maxSigma) continue;
+                               if (diffZ > maxSigma) continue;
+                               Double_t fitQuality = diffX*diffX + diffY*diffY + diffZ*diffZ;

 
                                // Now check the fit quality.
                                if (fitQuality < bestFitQuality)
 
                                // Now check the fit quality.
                                if (fitQuality < bestFitQuality)


@@ -232,7 +245,13 @@ void MakeHitsTable(
                                                continue;
                                        TVector3 hV(hitX[ch][ti], hitY[ch][ti], hitZ[ch][ti]);
                                        TVector3 diff = hV - hit;
                                                continue;
                                        TVector3 hV(hitX[ch][ti], hitY[ch][ti], hitZ[ch][ti]);
                                        TVector3 diff = hV - hit;

-                                       Double_t fitQuality = diff.Mag2(); // Use the square of diff. More Chi^2 like properties.
+                                       Double_t diffX = diff.X() / sigmaXtrg;
+                                       Double_t diffY = diff.Y() / sigmaYtrg;
+                                       Double_t diffZ = diff.Z() / sigmaZtrg;
+                                       if (diffX > maxSigma) continue;
+                                       if (diffY > maxSigma) continue;
+                                       if (diffZ > maxSigma) continue;
+                                       Double_t fitQuality = diffX*diffX + diffY*diffY + diffZ*diffZ;

 
                                        // Now check the fit quality.
                                        if (fitQuality < bestFitQuality)
 
                                        // Now check the fit quality.
                                        if (fitQuality < bestFitQuality)

diff --git a/HLT/MUON/macros/MakeTrackTable.C b/HLT/MUON/macros/MakeTrackTable.C
index 492ca264df75ce95f06c72d1f723b6a4a775dbc8..c946ec48aa2e7a5a031e3c3439e645eeb2168933 100644 (file)
--- a/HLT/MUON/macros/MakeTrackTable.C
+++ b/HLT/MUON/macros/MakeTrackTable.C
@@ -29,6 +29,7 @@
 #include "TNtuple.h"
 #include "TFile.h"
 #include "TError.h"
 #include "TNtuple.h"
 #include "TFile.h"
 #include "TError.h"

+#include "TMath.h"

 
 #include "AliLoader.h"
 #include "AliRunLoader.h"
 
 #include "AliLoader.h"
 #include "AliRunLoader.h"


@@ -51,7 +52,14 @@ using std::endl;
 void MakeTrackTable(
                Int_t firstEvent = 0,
                Int_t lastEvent = -1,
 void MakeTrackTable(
                Int_t firstEvent = 0,
                Int_t lastEvent = -1,

-               const char* dHLToutputfile = "output_0x00000000.root"
+               const char* dHLToutputfile = "output_0x00000000.root",
+               Float_t maxSigma = 4., // 4 standard deviations
+               Float_t sigmaX = 0.1,  // 1 mm resolution
+               Float_t sigmaY = 0.01, // 100 micron resolution
+               Float_t sigmaZ = 0.02,  // 200 microns resolution
+               Float_t sigmaXtrg = 0.5,  // 5 mm resolution
+               Float_t sigmaYtrg = 0.5,  // 5 mm resolution
+               Float_t sigmaZtrg = 0.02  // 2 microns resolution

        )
 {
        gSystem->Load("libAliHLTMUON.so");
        )
 {
        gSystem->Load("libAliHLTMUON.so");


@@ -258,7 +266,13 @@ void MakeTrackTable(
                                        
                                        TVector3 hV(hitX[j-1][kinetrack], hitY[j-1][kinetrack], hitZ[j-1][kinetrack]);
                                        TVector3 diff = hV - hit->Coordinate();
                                        
                                        TVector3 hV(hitX[j-1][kinetrack], hitY[j-1][kinetrack], hitZ[j-1][kinetrack]);
                                        TVector3 diff = hV - hit->Coordinate();

-                                       sumOfDiffs += diff.Mag2(); // Use the square of diff. More Chi^2 like properties.
+                                       Double_t diffX = diff.X() / sigmaX;
+                                       Double_t diffY = diff.Y() / sigmaY;
+                                       Double_t diffZ = diff.Z() / sigmaZ;
+                                       if (diffX > maxSigma) continue;
+                                       if (diffY > maxSigma) continue;
+                                       if (diffZ > maxSigma) continue;
+                                       sumOfDiffs += diffX*diffX + diffY*diffY + diffZ*diffZ;

                                        hitsMatched++;
                                }
                                if (mtrack->TriggerRecord() != NULL)
                                        hitsMatched++;
                                }
                                if (mtrack->TriggerRecord() != NULL)


@@ -272,14 +286,20 @@ void MakeTrackTable(
                                                
                                                TVector3 hV(hitX[j-1][kinetrack], hitY[j-1][kinetrack], hitZ[j-1][kinetrack]);
                                                TVector3 diff = hV - hit;
                                                
                                                TVector3 hV(hitX[j-1][kinetrack], hitY[j-1][kinetrack], hitZ[j-1][kinetrack]);
                                                TVector3 diff = hV - hit;

-                                               sumOfDiffs += diff.Mag2(); // Use the square of diff. More Chi^2 like properties.
+                                               Double_t diffX = diff.X() / sigmaXtrg;
+                                               Double_t diffY = diff.Y() / sigmaYtrg;
+                                               Double_t diffZ = diff.Z() / sigmaZtrg;
+                                               if (diffX > maxSigma) continue;
+                                               if (diffY > maxSigma) continue;
+                                               if (diffZ > maxSigma) continue;
+                                               sumOfDiffs += diffX*diffX + diffY*diffY + diffZ*diffZ;

                                                hitsMatched++;
                                        }
                                }
                                
                                // Now check the fit quality.
                                if (hitsMatched <= 0) continue;
                                                hitsMatched++;
                                        }
                                }
                                
                                // Now check the fit quality.
                                if (hitsMatched <= 0) continue;

-                               Double_t fitQuality = sumOfDiffs / hitsMatched;
+                               Double_t fitQuality = TMath::Sqrt(sumOfDiffs) / hitsMatched;

                                if (fitQuality < bestFitQuality)
                                {
                                        bestFitQuality = fitQuality;
                                if (fitQuality < bestFitQuality)
                                {
                                        bestFitQuality = fitQuality;

diff --git a/HLT/MUON/macros/MakeTriggerTable.C b/HLT/MUON/macros/MakeTriggerTable.C
index a27a9137d63599802a1cd2e9d167dc9ac0bad2aa..86ff6415eccca671be256d2543e72944b01f273a 100644 (file)
--- a/HLT/MUON/macros/MakeTriggerTable.C
+++ b/HLT/MUON/macros/MakeTriggerTable.C
@@ -51,7 +51,11 @@ using std::endl;
 void MakeTriggerTable(
                Int_t firstEvent = 0,
                Int_t lastEvent = -1,
 void MakeTriggerTable(
                Int_t firstEvent = 0,
                Int_t lastEvent = -1,

-               const char* L0outputfile = "output_0x00000000.root"
+               const char* L0outputfile = "output_0x00000000.root",
+               Float_t maxSigma = 4., // 4 standard deviations
+               Float_t sigmaXtrg = 0.5,  // 5 mm resolution
+               Float_t sigmaYtrg = 0.5,  // 5 mm resolution
+               Float_t sigmaZtrg = 0.02  // 2 microns resolution

        )
 {
        gSystem->Load("libAliHLTMUON.so");
        )
 {
        gSystem->Load("libAliHLTMUON.so");


@@ -240,7 +244,13 @@ void MakeTriggerTable(
                                        TVector3 hV(hitX[j-11][kinetrack], hitY[j-11][kinetrack], hitZ[j-11][kinetrack]);
                                        if (hV == TVector3(0,0,0)) continue;
                                        TVector3 diff = hV - hit;
                                        TVector3 hV(hitX[j-11][kinetrack], hitY[j-11][kinetrack], hitZ[j-11][kinetrack]);
                                        if (hV == TVector3(0,0,0)) continue;
                                        TVector3 diff = hV - hit;

-                                       sumOfDiffs += diff.Mag2(); // Use the square of diff. More Chi^2 like properties.
+                                       Double_t diffX = diff.X() / sigmaXtrg;
+                                       Double_t diffY = diff.Y() / sigmaYtrg;
+                                       Double_t diffZ = diff.Z() / sigmaZtrg;
+                                       if (diffX > maxSigma) continue;
+                                       if (diffY > maxSigma) continue;
+                                       if (diffZ > maxSigma) continue;
+                                       sumOfDiffs += diffX*diffX + diffY*diffY + diffZ*diffZ;

                                        hitsMatched++;
                                }
                                
                                        hitsMatched++;
                                }