updated view of the trigger sources in AliTRDcheckDetector

faster constructor for AliTRDchamberTimeBin

diff --git a/TRD/AliTRDchamberTimeBin.cxx b/TRD/AliTRDchamberTimeBin.cxx
index ca9dc9f752703e3267b250c71cb26c3dc948fc38..5313763373d08e24b59365d9f2ab8b86610eb17f 100644 (file)
--- a/TRD/AliTRDchamberTimeBin.cxx
+++ b/TRD/AliTRDchamberTimeBin.cxx
@@ -65,11 +65,9 @@ AliTRDchamberTimeBin::AliTRDchamberTimeBin(Int_t plane, Int_t stack, Int_t secto
   // Default constructor (Only provided to use AliTRDchamberTimeBin with arrays)
   //
 
-  for(int i=0; i<kMaxRows; i++) fPositions[i] = 0xff;
-  for(int ic=0; ic<kMaxClustersLayer; ic++){
-    fClusters[ic] = 0x0;
-    fIndex[ic]    = 0xffff;
-  }
+  memset(fPositions, 1, kMaxRows*sizeof(UChar_t));
+  memset(fClusters, 0, kMaxClustersLayer*sizeof(AliTRDcluster*));
+  memset(fIndex, 1, kMaxClustersLayer*sizeof(UInt_t));
 }
 
 // //_____________________________________________________________________________

diff --git a/TRD/qaRec/AliTRDcheckDetector.cxx b/TRD/qaRec/AliTRDcheckDetector.cxx
index 6eaad07366151d2f0e4f2ec9b4932e1b2ca2265c..d771ac4269141ad632e8145815e833b3e7c8d5c8 100644 (file)
--- a/TRD/qaRec/AliTRDcheckDetector.cxx
+++ b/TRD/qaRec/AliTRDcheckDetector.cxx
@@ -141,7 +141,7 @@ void AliTRDcheckDetector::Exec(Option_t *){
   if(fEventInfo->GetEventHeader()->GetEventType() != 7) return;
   Int_t nTracks = 0;           // Count the number of tracks per event
   Int_t triggermask = fEventInfo->GetEventHeader()->GetTriggerMask();
-  TString triggername =  fEventInfo->GetRunInfo()->GetTriggerClass(triggermask);
+  TString triggername =  fEventInfo->GetRunInfo()->GetFiredTriggerClasses(triggermask);
   dynamic_cast<TH1F *>(fContainer->UncheckedAt(kNEventsTrigger))->Fill(triggermask);
   AliTRDtrackInfo *fTrackInfo = 0x0;
   AliTRDtrackV1 *fTRDtrack = 0x0;
@@ -221,8 +221,6 @@ Bool_t AliTRDcheckDetector::PostProcess(){
        histo->GetYaxis()->SetTitle("Events");
        // Calculate percentage of events containing tracks
        Int_t entries = (Int_t)histo->GetEntries();
-  Float_t percTracks = entries > 0 ? (entries - histo->GetBinContent(1))/Float_t(entries) : 0.;
-       printf("Percentage of Events containing TRD Tracks: %6.3f %%\n", 1.E2*percTracks);
        histo = dynamic_cast<TH1F *>(fContainer->UncheckedAt(kNclustersHist));
        histo->GetXaxis()->SetTitle("Number of Clusters");
        histo->GetYaxis()->SetTitle("Entries");
@@ -258,14 +256,14 @@ Bool_t AliTRDcheckDetector::PostProcess(){
        for(Int_t ibin = 0; ibin < histo->GetNbinsX(); ibin++){
                if((triggerclass = fTriggerNames->FindObject(Form("%d",ibin)))){
                        TObjString *label = dynamic_cast<TObjString *>(dynamic_cast<TPair *>(triggerclass)->Value());
-                       printf("Trigger Pattern for class %d: %s\n", ibin, label->String().Data());
+                       //printf("Trigger Pattern for class %d: %s\n", ibin, label->String().Data());
                        percentages->SetBinContent(percentages->FindBin(ipt), histoTracks->GetBinContent(histoTracks->FindBin(ibin)));
-                       percentages->GetXaxis()->SetBinLabel(percentages->FindBin(ibin),label->String().Data());
+                       percentages->GetXaxis()->SetBinLabel(percentages->FindBin(ipt),label->String().Data());
                        ipt++;
                }       
        }
        percentages->GetXaxis()->SetTitle("Trigger Cluster");
-       percentages->GetYaxis()->SetTitle("%Events");
+       percentages->GetYaxis()->SetTitle("Ratio");
        percentages->GetYaxis()->SetRangeUser(0,1);
 //     percentages->SetMarkerColor(kBlue);
 //     percentages->SetMarkerStyle(22);

diff --git a/TRD/qaRec/AliTRDtrackInfoGen.cxx b/TRD/qaRec/AliTRDtrackInfoGen.cxx
index df978f4ac2bd2994805ebd88f6c8c952038856a1..40ba294a40c9204bac01262d103651abae796a46 100644 (file)
--- a/TRD/qaRec/AliTRDtrackInfoGen.cxx
+++ b/TRD/qaRec/AliTRDtrackInfoGen.cxx
@@ -54,6 +54,7 @@
 
 #include <cstdio>
 #include <cstring>
+#include <iostream>
 
 #include "AliTRDtrackInfoGen.h"
 #include "AliTRDtrackInfo/AliTRDtrackInfo.h"
@@ -88,6 +89,7 @@ AliTRDtrackInfoGen::~AliTRDtrackInfoGen()
 {
   if(fTrackInfo) delete fTrackInfo;
   //if(fEventInfo) delete fEventInfo;
+  //fTrackInfo = 0x0; fEventInfo = 0x0;
 }
 
 //____________________________________________________________________
@@ -160,6 +162,7 @@ void AliTRDtrackInfoGen::Exec(Option_t *){
     return;
   }
   fContainer->Delete();
+  fEventInfo->Delete("");
   fESD->SetESDfriend(fESDfriend);
   new(fEventInfo)AliTRDeventInfo(fESD->GetHeader(), const_cast<AliESDRun *>(fESD->GetESDRun()));