X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDgtuTMU.cxx;h=abb69af89dc314ed6f5c04012fe9382eae14631d;hb=e348db2b607f572167637af01992c49b319f2ca3;hp=efb975a6a49fead7743c001f423710f3a8f184c4;hpb=ee373611f3202216ad84be6324f08f47580aedd2;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TRD/AliTRDgtuTMU.cxx b/TRD/AliTRDgtuTMU.cxx
index efb975a6a49..abb69af89dc 100644
--- a/TRD/AliTRDgtuTMU.cxx
+++ b/TRD/AliTRDgtuTMU.cxx
@@ -46,6 +46,7 @@ AliTRDgtuTMU::AliTRDgtuTMU(Int_t stack, Int_t sector) :
   fTracklets(0x0),
   fTrackletsPostInput(0x0),
   fZChannelTracklets(0x0),
+  fTrackArray(new TClonesArray("AliTRDtrackGTU", 50)),
   fTracks(0x0),
   fGtuParam(0x0),
   fStack(-1),
@@ -88,12 +89,14 @@ AliTRDgtuTMU::~AliTRDgtuTMU()
     delete [] fTracks[zch];
   }
   delete [] fTracks;
+  delete fTrackArray;
+
   for (Int_t layer = 0; layer < fGtuParam->GetNLayers(); layer++) {
     delete [] fZChannelTracklets[layer];
-    //    delete [] fTrackletsPostInput[layer];
+    delete fTrackletsPostInput[layer];
   }
   delete [] fZChannelTracklets;
-  //  delete [] fTrackletsPostInput;
+  delete [] fTrackletsPostInput;
 
   for (Int_t iLink = 0; iLink < fGtuParam->GetNLinks(); iLink++) {
     delete fTracklets[iLink];
@@ -137,6 +140,8 @@ Bool_t AliTRDgtuTMU::Reset()
     }
   }
 
+  fTrackArray->Delete();
+
   // delete all added tracklets
   for (Int_t iLink = 0; iLink < fGtuParam->GetNLinks(); iLink++) {
     fTracklets[iLink]->Clear();
@@ -162,7 +167,7 @@ Bool_t AliTRDgtuTMU::AddTracklet(AliTRDtrackletGTU *tracklet, Int_t link)
 }
 
 
-Bool_t AliTRDgtuTMU::RunTMU(TList *ListOfTracks, AliESDEvent *esd)
+Bool_t AliTRDgtuTMU::RunTMU(TList *ListOfTracks, AliESDEvent *esd, Int_t outLabel)
 {
   // performs the analysis as in a TMU module of the GTU, i. e.
   // track matching
@@ -185,7 +190,6 @@ Bool_t AliTRDgtuTMU::RunTMU(TList *ListOfTracks, AliESDEvent *esd)
   // ----- Z-channel units -----
   AliDebug(1,"--------- Running Z-channel units ----------");
   for (Int_t layer = 0;  layer <  fGtuParam->GetNLayers(); layer++) {
-    fZChannelTracklets[layer] = new TList[fGtuParam->GetNZChannels()];
     if (!RunZChannelUnit(layer)) {
       AliError(Form("Z-Channel unit in layer %i failed", layer));
       return kFALSE;
@@ -213,13 +217,18 @@ Bool_t AliTRDgtuTMU::RunTMU(TList *ListOfTracks, AliESDEvent *esd)
     return kFALSE;
   }
 
-  if (esd) {
-      TIter next(ListOfTracks);
-      while (AliTRDtrackGTU *trk = (AliTRDtrackGTU*) next()) {
-	  AliESDTrdTrack *trdtrack = trk->CreateTrdTrack();
-	  esd->AddTrdTrack(trdtrack);
-	  delete trdtrack;
-      }
+  // ----- label calculation and ESD storage -----
+  TIter next(ListOfTracks);
+  while (AliTRDtrackGTU *trk = (AliTRDtrackGTU*) next()) {
+    if (outLabel == -1)
+      trk->CookLabel();
+    else
+      trk->SetLabel(outLabel);
+    if (esd) {
+      AliESDTrdTrack *trdtrack = trk->CreateTrdTrack();
+      esd->AddTrdTrack(trdtrack);
+      delete trdtrack;
+    }
   }
 
   return kTRUE;
@@ -232,7 +241,11 @@ Bool_t AliTRDgtuTMU::RunInputUnit(Int_t layer)
   Int_t iTrkl0 = 0; // A-side tracklet
   Int_t iTrkl1 = 0; // B-side tracklet
 
-  while ((iTrkl0 < fTracklets[2*layer + 0]->GetEntriesFast()) || (iTrkl1 < fTracklets[2*layer + 1]->GetEntriesFast())) {
+  Int_t nTracklets = 0;
+  while ((!fGtuParam->GetLimitNoTracklets() ||
+	  (nTracklets < fGtuParam->GetMaxNoTracklets())) &&
+	 ((iTrkl0 < fTracklets[2*layer + 0]->GetEntriesFast()) ||
+	  (iTrkl1 < fTracklets[2*layer + 1]->GetEntriesFast()))) {
     if (iTrkl1 >= fTracklets[2*layer + 1]->GetEntriesFast()) {
       fTrackletsPostInput[layer]->AddLast(fTracklets[2*layer + 0]->At(iTrkl0));
       iTrkl0++;
@@ -255,6 +268,7 @@ Bool_t AliTRDgtuTMU::RunInputUnit(Int_t layer)
 	}
       }
     }
+    ++nTracklets;
   }
 
   TIter next(fTrackletsPostInput[layer]);
@@ -266,22 +280,23 @@ Bool_t AliTRDgtuTMU::RunInputUnit(Int_t layer)
     alpha = ( 2 * trk->GetdY() - (alpha >> fGtuParam->GetBitExcessAlpha()) + 1 ) >> 1;
     // wrapping projected alpha as in hardware
     if ((alpha < -64) || (alpha > 63))
-      AliError(Form("alpha out of range: %i", alpha));
+      AliDebug(1, Form("alpha out of range: %i", alpha));
     alpha = alpha & 0x7f;
     if (alpha & 0x40)
       trk->SetAlpha(0xffffffc0 | alpha);
     else
       trk->SetAlpha(alpha);
 
-    Int_t yproj = trk->GetdY() * (fGtuParam->GetCiYProj(layer)); //??? sign?
+    Int_t yproj = trk->GetdY() * (fGtuParam->GetCiYProj(layer));
     yproj = ( ( ( (yproj >> fGtuParam->GetBitExcessYProj()) + trk->GetYbin() ) >> 2) + 1) >> 1;
     trk->SetYProj(yproj);
 
     trk->SetYPrime(trk->GetYbin() + fGtuParam->GetYt(fStack, layer, trk->GetZbin()));
 
-    AliDebug(10, Form("0x%08x: idx: %3i, z: %2i, y: %5i, dy: %3i, y': %5i, y_proj: %5i, alpha: %3i, pid: %3i",
+    AliDebug(10, Form("0x%08x: idx: %3i, z: %2i, y: %5i, dy: %3i, y': %5i, y_proj: %5i, alpha: %3i, pid: %3i, c: %5i, yt: %5i",
 		      trk->GetTrackletWord(), trk->GetIndex(), trk->GetZbin(), trk->GetYbin(), trk->GetdY(), trk->GetYPrime(),
-		      trk->GetYProj(), trk->GetAlpha(), trk->GetPID() ));
+		      trk->GetYProj(), trk->GetAlpha(), trk->GetPID(),
+		      fGtuParam->GetCiYProj(layer), fGtuParam->GetYt(fStack, layer, trk->GetZbin()) ));
   }
   return kTRUE;
 }
@@ -517,7 +532,7 @@ Bool_t AliTRDgtuTMU::RunTrackFinder(Int_t zch, TList* /* ListOfTracks */)
 
        if (nHits >= 4) {
 	 // ----- track registration -----
-	 AliTRDtrackGTU *track = new AliTRDtrackGTU();
+	 AliTRDtrackGTU *track = new ((*fTrackArray)[fTrackArray->GetEntriesFast()]) AliTRDtrackGTU();
 	 track->SetSector(fSector);
 	 track->SetStack(fStack);
 	 for (Int_t layer = 0; layer < fGtuParam->GetNLayers(); layer++ ) {
@@ -656,14 +671,14 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks)
 
     AliTRDtrackGTU **trkInRefLayer = new AliTRDtrackGTU*[fGtuParam->GetNRefLayers()];
 
-    Bool_t done = kFALSE;
+    // Bool_t done = kFALSE;
     Int_t minIdx = 0;
     AliTRDtrackGTU *trkStage0 = 0x0;
 
     for (Int_t zch = 0; zch < fGtuParam->GetNZChannels(); zch++) {
         // ----- Merging and Unification in Reflayers (seed_merger) -----
 	do {
-	    done = kTRUE;
+	  // done = kTRUE;
 	    trkStage0 = 0x0;
 	    for (Int_t refLayerIdx = 0; refLayerIdx < fGtuParam->GetNRefLayers(); refLayerIdx++) {
 		trkInRefLayer[refLayerIdx] = (AliTRDtrackGTU*) fTracks[zch][refLayerIdx].First();
@@ -673,13 +688,14 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks)
 		else if (trkStage0 == 0x0 ) {
 		    trkStage0 = trkInRefLayer[refLayerIdx];
 		    minIdx = refLayerIdx;
-		    done = kFALSE;
+		    // done = kFALSE;
 		}
-		else if (trkInRefLayer[refLayerIdx]->GetZSubChannel() < trkStage0->GetZSubChannel() ||
-			 (trkInRefLayer[refLayerIdx]->GetZSubChannel() == trkStage0->GetZSubChannel() && trkInRefLayer[refLayerIdx]->GetYapprox() < trkStage0->GetYapprox()) ) {
+		else if ( (trkInRefLayer[refLayerIdx]->GetZSubChannel() < trkStage0->GetZSubChannel()) ||
+			  ((trkInRefLayer[refLayerIdx]->GetZSubChannel() == trkStage0->GetZSubChannel()) &&
+			   ((trkInRefLayer[refLayerIdx]->GetYapprox() >> 3) < (trkStage0->GetYapprox() >> 3)) ) ) {
 		    minIdx = refLayerIdx;
 		    trkStage0 = trkInRefLayer[refLayerIdx];
-		    done = kFALSE;
+		    // done = kFALSE;
 		}
 	    }
             if (!trkStage0)
@@ -720,32 +736,137 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks)
 
 // ----- Merging in zchannels - 1st stage -----
 
-    do {
-	done = kTRUE;
-	trkStage0 = 0x0;
-        for (Int_t zch = fGtuParam->GetNZChannels() - 1; zch > -1; zch--) {
-	    AliTRDtrackGTU *trk = (AliTRDtrackGTU*) tracksRefUnique[zch]->First();
-	    if (trk == 0) {
-		continue;
+    if (AliTRDgtuParam::GetUseGTUmerge()) {
+      Int_t notEmpty;
+      do {
+	Bool_t lowerThan[3] = { kFALSE, kFALSE, kFALSE };
+	AliTRDtrackGTU *trk[3] = { 0x0, 0x0, 0x0 };
+	for (Int_t iChannel = 0; iChannel < fGtuParam->GetNZChannels(); ++iChannel)
+	  trk[iChannel] = (AliTRDtrackGTU*) tracksRefUnique[iChannel]->First();
+
+	for (Int_t iChannel = 0; iChannel < fGtuParam->GetNZChannels(); ++iChannel) {
+	  AliTRDtrackGTU *trk1 = trk[iChannel];
+	  AliTRDtrackGTU *trk2 = trk[(iChannel + 1) % 3];
+	  if (trk1 && trk2) {
+	    Int_t sortnum1 = (trk1->GetZChannel() + 3 * trk1->GetZSubChannel()) / 2 - 1;
+	    Int_t sortnum2 = (trk2->GetZChannel() + 3 * trk2->GetZSubChannel()) / 2 - 1;
+	    AliDebug(5, Form("comparing tracks %i - %i: %i - %i",
+			     trk1->GetZChannel(), trk2->GetZChannel(),
+			     sortnum1, sortnum2));
+	    if ( (sortnum1 < sortnum2) ||
+		 ((sortnum1 == sortnum2) &&
+		  ((trk1->GetYapprox() >> 3) < (trk2->GetYapprox() >> 3)) ) ) {
+	      lowerThan[iChannel] = kTRUE;
 	    }
-	    else if (trkStage0 == 0x0 ) {
-		trkStage0 = trk;
-		minIdx = zch;
-		done = kFALSE;
-	    }
-	    else if ( ((trk->GetZChannel() + 3 * trk->GetZSubChannel()) / 2 - 1) <  ((trkStage0->GetZChannel() + 3 * trkStage0->GetZSubChannel()) / 2 -1 ) ||
-		      (((trk->GetZChannel() + 3 * trk->GetZSubChannel()) / 2 - 1) == ((trkStage0->GetZChannel() + 3 * trkStage0->GetZSubChannel()) / 2 -1 ) && (trk->GetYapprox() < trkStage0->GetYapprox()) ) ) {
-		minIdx = zch;
-		trkStage0 = trk;
-		done = kFALSE;
+	  }
+	}
+
+	notEmpty = (trk[2] ? (1 << 2) : 0) |
+	  (trk[1] ? (1 << 1) : 0) |
+	  (trk[0] ? (1 << 0) : 0);
+	Int_t pop = -1;
+
+	switch (notEmpty) {
+	  // one track only
+	case 0x1:
+	  pop = 0;
+	  break;
+	case 0x2:
+	  pop = 1;
+	  break;
+	case 0x4:
+	  pop = 2;
+	  break;
+
+	  // two tracks
+	case 0x3:
+	  if (lowerThan[0])
+	    pop = 0;
+	  else
+	    pop = 1;
+	  break;
+	case 0x5:
+	  if (lowerThan[2])
+	    pop = 2;
+	  else
+	    pop = 0;
+	  break;
+	case 0x6:
+	  if (lowerThan[1])
+	    pop = 1;
+	  else
+	    pop = 2;
+	  break;
+
+	  // three tracks
+	case 0x7:
+	  if (lowerThan[0]) {
+	    if (lowerThan[2])
+	      pop = 2;
+	    else
+	      pop = 0;
+	  } else {
+	    if (lowerThan[1])
+	      pop = 1;
+	    else
+	      pop = 2;
+	  }
+	  break;
+
+	  // no tracks
+	default:
+	  // nop
+	  ;
+	}
+
+	if (pop > -1) {
+	  tracksZMergedStage0->Add(trk[pop]);
+	  tracksRefUnique[pop]->RemoveFirst();
+	}
+      } while (notEmpty);
+    }
+    else {
+      // there is still a difference between this implementation and
+      // the hardware algorithm, only for expert use
+
+      do {
+	// done = kTRUE;
+	trkStage0 = 0x0;
+	// compare tracks from all adjacent zchannels
+	// (including comparison of channels 2 and 0)
+        for (Int_t i = fGtuParam->GetNZChannels() - 1; i > -1; i--) {
+	  Int_t zch = i % 3;
+	  AliTRDtrackGTU *trk = (AliTRDtrackGTU*) tracksRefUnique[zch]->First();
+	  if (trk == 0) {
+	    continue;
+	  }
+	  else if (trkStage0 == 0x0 ) {
+	    trkStage0 = trk;
+	    minIdx = zch;
+	    // done = kFALSE;
+	  }
+	  else {
+	    Int_t sortnum1 = (trk->GetZChannel() + 3 * trk->GetZSubChannel()) / 2 - 1;
+	    Int_t sortnum2 = (trkStage0->GetZChannel() + 3 * trkStage0->GetZSubChannel()) / 2 - 1;
+	    AliDebug(5, Form("comparing tracks %i - %i: %i - %i",
+			     trk->GetZChannel(), trkStage0->GetZChannel(),
+			     sortnum1, sortnum2));
+	    if ( (sortnum1 < sortnum2) ||
+		 ((sortnum1 == sortnum2) &&
+		  ((trk->GetYapprox() >> 3) < (trkStage0->GetYapprox() >> 3)) ) ) {
+	      minIdx = zch;
+	      trkStage0 = trk;
+	      // done = kFALSE;
 	    }
+	  }
 	}
 
 	if (!trkStage0)
           break;
 	tracksZMergedStage0->Add(trkStage0);
 	tracksRefUnique[minIdx]->RemoveFirst();
-    } while (trkStage0 != 0);
+      } while (trkStage0 != 0);
+    }
 
     Uniquifier(tracksZMergedStage0, tracksZUniqueStage0);
 
@@ -783,7 +904,25 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks)
 
     TIter next(tracksZUniqueStage0);
     while (AliTRDtrackGTU *trk = (AliTRDtrackGTU*) next()) {
-	tracksZSplitted[(trk->GetZChannel() + 3 * (trk->GetZSubChannel() - 1)) % 2]->Add(trk);
+      if ((trk->GetZChannel() < 0) ||
+	  (trk->GetZChannel() > 2) ||
+	  (trk->GetZSubChannel() < 0) ||
+	  (trk->GetZSubChannel() > 6)) {
+	AliError(Form("track with invalid z-channel information at %p: zch = %i, subchannel = %i",
+		      trk, trk->GetZChannel(), trk->GetZSubChannel()));
+	trk->Dump();
+      }
+      Int_t idx = (trk->GetZChannel() + 3 * (trk->GetZSubChannel() - 1)) % 2;
+      if ((idx < 0) || (idx > 1)) {
+	AliError(Form("invalid index %i null", idx));
+	trk->Dump();
+	continue;
+      }
+      if (!tracksZSplitted[idx]) {
+	AliError(Form("array pointer %i null", idx));
+	continue;
+      }
+      tracksZSplitted[idx]->Add(trk);
     }
 
     for (Int_t i = 0; i < 2; i++) {
@@ -806,7 +945,7 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks)
 // ----- Merging in zchanels - 2nd stage -----
 
     do {
-	done = kTRUE;
+      // done = kTRUE;
 	trkStage0 = 0x0;
 	for (Int_t i = 1; i >= 0; i--) {
 	    AliTRDtrackGTU *trk = (AliTRDtrackGTU*) tracksZSplitted[i]->First();
@@ -816,13 +955,14 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks)
 	    else if (trkStage0 == 0x0 ) {
 		trkStage0 = trk;
 		minIdx = i;
-		done = kFALSE;
+		// done = kFALSE;
 	    }
-	    else if ( (((trk->GetZChannel() + 3 * (trk->GetZSubChannel() - 1)) / 2) <  ((trkStage0->GetZChannel() + 3 * (trkStage0->GetZSubChannel() - 1)) / 2)) ||
-		      ((((trk->GetZChannel() + 3 * (trk->GetZSubChannel() - 1)) / 2) == ((trkStage0->GetZChannel() + 3 * (trkStage0->GetZSubChannel() - 1)) / 2)) && (trk->GetYapprox() < trkStage0->GetYapprox()) ) ) {
+	    else if (  (((trk->GetZChannel() + 3 * (trk->GetZSubChannel() - 1)) / 2) <  ((trkStage0->GetZChannel() + 3 * (trkStage0->GetZSubChannel() - 1)) / 2)) ||
+		      ((((trk->GetZChannel() + 3 * (trk->GetZSubChannel() - 1)) / 2) == ((trkStage0->GetZChannel() + 3 * (trkStage0->GetZSubChannel() - 1)) / 2)) &&
+		       ((trk->GetYapprox() >> 3) < (trkStage0->GetYapprox() >> 3)) ) ) {
 		minIdx = i;
 		trkStage0 = trk;
-		done = kFALSE;
+		// done = kFALSE;
 	    }
 	}
 
@@ -910,6 +1050,7 @@ Bool_t AliTRDgtuTMU::CalculatePID(AliTRDtrackGTU *track)
 
   if (AliTRDgtuParam::GetUseGTUconst()) {
     // averaging as in GTU
+    AliDebug(1, "using GTU constants for PID calculation");
     ULong64_t coeff;
 
     // selection of coefficient for averaging
@@ -936,16 +1077,21 @@ Bool_t AliTRDgtuTMU::CalculatePID(AliTRDtrackGTU *track)
     coeff &= 0x1ffff; // 17-bit constant
 
     ULong64_t sum = 0;
+    Int_t i = 0;
     for (Int_t iLayer = 0; iLayer < fGtuParam->GetNLayers(); iLayer++) {
       if ((track->GetTrackletMask() >> iLayer) & 1) {
 	sum += track->GetTracklet(iLayer)->GetPID();
+	++i;
       }
     }
 
+    Float_t av = 1./i * sum;
     sum = sum & 0x7ff;
     ULong64_t prod   = (sum * coeff) & 0xfffffffffull;
     ULong64_t prodFinal = ((prod >> 17) + ((prod >> 16) & 1)) & 0xff;
 
+    if (TMath::Abs((prodFinal & 0xff) - av) > 0.5)
+      AliError(Form("problem with PID averaging (hw <-> ar): %3lli <-> %4.1f", prodFinal & 0xff, av));
     track->SetPID(prodFinal & 0xff);
 
     return kTRUE;
@@ -999,8 +1145,9 @@ Bool_t AliTRDgtuTMU::CalculateTrackParams(AliTRDtrackGTU *track)
       AliError(Form("Could not get tracklet in layer %i\n", layer));
       continue;
     }
-    AliDebug(10,Form("  layer %i trk yprime: %6i, aki: %6i", layer, trk->GetYPrime(), (Int_t) (2048 * fGtuParam->GetAki(track->GetTrackletMask(), layer))));
-    a += (((Int_t) (2048 * fGtuParam->GetAki(track->GetTrackletMask(), layer))) * trk->GetYPrime() + 1) >> 8;
+    AliDebug(10,Form("  layer %i trk yprime: %6i, aki: %6i", layer, trk->GetYPrime(),
+		     fGtuParam->GetAki(track->GetTrackletMask(), layer)));
+    a += (((fGtuParam->GetAki(track->GetTrackletMask(), layer) * trk->GetYPrime()) >> 7) + 1) >> 1;
     b += fGtuParam->GetBki(track->GetTrackletMask(), layer) * trk->GetYPrime() * fGtuParam->GetBinWidthY();
     c += fGtuParam->GetCki(track->GetTrackletMask(), layer) * trk->GetYPrime() * fGtuParam->GetBinWidthY();
   }
@@ -1008,11 +1155,12 @@ Bool_t AliTRDgtuTMU::CalculateTrackParams(AliTRDtrackGTU *track)
       a += 3;
   a = a >> 2;
 
-  track->SetFitParams(a, b, c);
+  track->SetFitParams(a << 2, b, c);
 
   fGtuParam->GetIntersectionPoints(track->GetTrackletMask(), x1, x2);
 
-  AliDebug(5,Form("  Track parameters: a = %i, b = %f, c = %f, x1 = %f, x2 = %f, pt = %f (trkl mask: %i)", a, b, c, x1, x2, track->GetPt(), track->GetTrackletMask()));
+  AliDebug(5,Form("  Track parameters: a16 = %i, a18 = %i, b = %f, c = %f, x1 = %f, x2 = %f, pt = %f (trkl mask: %i)",
+		  a, a << 2, b, c, x1, x2, track->GetPt(), track->GetTrackletMask()));
 
   return kTRUE;
 }
@@ -1027,7 +1175,7 @@ Bool_t AliTRDgtuTMU::Uniquifier(const TList *inlist, TList *outlist)
     AliTRDtrackGTU *trkStage1 = 0x0;
 
     do {
-	trkStage0 = (AliTRDtrackGTU*) next();
+        trkStage0 = (AliTRDtrackGTU*) next();
 
 	Bool_t tracksEqual = kFALSE;
 	if (trkStage0 != 0 && trkStage1 != 0) {
@@ -1040,8 +1188,8 @@ Bool_t AliTRDgtuTMU::Uniquifier(const TList *inlist, TList *outlist)
 	}
 
 	if (tracksEqual) {
-	    if (trkStage0->GetNTracklets() >= trkStage1->GetNTracklets())
-		trkStage1 = trkStage0;
+	  if (trkStage0->GetNTracklets() >= trkStage1->GetNTracklets())
+	    trkStage1 = trkStage0;
 	}
 	else {
 	    if (trkStage1 != 0x0)