X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSQADataMakerRec.cxx;h=48b3e774d408d99e1fa58887ce922e3bb13770cf;hb=4bd2db93caac343ec3f609617a6d554456ec2885;hp=e80251d9097dc887fb616a79f0f8deecc0fe8b5d;hpb=4e25ac795836afea113484651fe7e4a9d3d2c95a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSQADataMakerRec.cxx b/ITS/AliITSQADataMakerRec.cxx
index e80251d9097..48b3e774d40 100644
--- a/ITS/AliITSQADataMakerRec.cxx
+++ b/ITS/AliITSQADataMakerRec.cxx
@@ -63,16 +63,16 @@ fSSDDataMaker(NULL)
 
   // Initialization for RAW data 
   if(fSubDetector == 0 || fSubDetector == 1) {
-    AliDebug(1,"AliITSQADM::Create SPD DataMakerRec\n");
+    AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM::Create SPD DataMakerRec\n");
 	fSPDDataMaker = new AliITSQASPDDataMakerRec(this,fkOnline);
   }
   if(fSubDetector == 0 || fSubDetector == 2) {
-	AliDebug(1,"AliITSQADM::Create SDD DataMakerRec\n");
+    AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM::Create SDD DataMakerRec\n");
 	fSDDDataMaker = new AliITSQASDDDataMakerRec(this,fkOnline);
 	if(fkOnline){SetHLTMode(fSDDDataMaker->GetHLTMode()); }
   }
   if(fSubDetector == 0 || fSubDetector == 3) {
-	AliDebug(1,"AliITSQADM::Create SSD DataMakerRec\n");
+    AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM::Create SSD DataMakerRec\n");
 	fSSDDataMaker = new AliITSQASSDDataMakerRec(this,fkOnline);
   }
 }
@@ -114,7 +114,7 @@ AliITSQADataMakerRec& AliITSQADataMakerRec::operator = (const AliITSQADataMakerR
 void AliITSQADataMakerRec::StartOfDetectorCycle()
 {
   //Detector specific actions at start of cycle
-  AliDebug(1,"AliITSQADM::Start of ITS Cycle\n");
+  AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM::Start of ITS Cycle\n");
   if(fSubDetector == 0 || fSubDetector == 1) fSPDDataMaker->StartOfDetectorCycle();
   if(fSubDetector == 0 || fSubDetector == 2) fSDDDataMaker->StartOfDetectorCycle();
   if(fSubDetector == 0 || fSubDetector == 3) fSSDDataMaker->StartOfDetectorCycle();
@@ -127,7 +127,7 @@ void AliITSQADataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArr
 
   for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) {
     SetEventSpecie(specie) ; 
-    AliDebug(1,"AliITSDM instantiates checker with Run(AliQAv1::kITS, task, list[specie])\n"); 
+    AliDebug(AliQAv1::GetQADebugLevel(),"AliITSDM instantiates checker with Run(AliQAv1::kITS, task, list[specie])\n"); 
     if(fSubDetector == 0 || fSubDetector == 1) fSPDDataMaker->EndOfDetectorCycle(task, list[specie]);
     if(fSubDetector == 0 || fSubDetector == 2) fSDDDataMaker->EndOfDetectorCycle(task, list[specie]);
     if(fSubDetector == 0 || fSubDetector == 3) fSSDDataMaker->EndOfDetectorCycle(task, list[specie]);
@@ -163,15 +163,15 @@ void AliITSQADataMakerRec::InitRaws()
 {  
   // Initialization for RAW data 
 	if(fSubDetector == 0 || fSubDetector == 1) {
-	  AliDebug(1,"AliITSQADM:: SPD InitRaws\n");
+	  AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SPD InitRaws\n");
 	  fSPDDataMaker->InitRaws();
 	}
 	if(fSubDetector == 0 || fSubDetector == 2) {
- 	  AliDebug(1,"AliITSQADM:: SDD InitRaws\n");
+ 	  AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SDD InitRaws\n");
 	  fSDDDataMaker->InitRaws();
 	}
 	if(fSubDetector == 0 || fSubDetector == 3) {
-	  AliDebug(1,"AliITSQADM:: SSD InitRaws\n");
+	  AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SSD InitRaws\n");
 	  fSSDDataMaker->InitRaws();
 	}
 }
@@ -185,20 +185,47 @@ void AliITSQADataMakerRec::MakeRaws(AliRawReader* rawReader)
   if(fSubDetector == 0 || fSubDetector == 3) fSSDDataMaker->MakeRaws(rawReader);
 }
 
+//____________________________________________________________________________ 
+void AliITSQADataMakerRec::InitDigits()
+{
+  // Initialization for DIGITS
+  if(fSubDetector == 0 || fSubDetector == 1) {
+    AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SPD InitDigitss\n");
+    fSPDDataMaker->InitDigits();
+  }
+  if(fSubDetector == 0 || fSubDetector == 2) {
+    AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SDD InitDigits\n");
+    fSDDDataMaker->InitDigits();
+  }
+  if(fSubDetector == 0 || fSubDetector == 3) {
+    AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SSD InitDigits\n");
+    fSSDDataMaker->InitDigits();
+  }
+}
+
+//____________________________________________________________________________ 
+void AliITSQADataMakerRec::MakeDigits(TTree * digitsTree)
+{
+  // Fill QA for recpoints
+  if(fSubDetector == 0 || fSubDetector == 1) fSPDDataMaker->MakeDigits(digitsTree);
+  if(fSubDetector == 0 || fSubDetector == 2) fSDDDataMaker->MakeDigits(digitsTree);
+  if(fSubDetector == 0 || fSubDetector == 3) fSSDDataMaker->MakeDigits(digitsTree);
+}
+
 //____________________________________________________________________________ 
 void AliITSQADataMakerRec::InitRecPoints()
 {
   // Initialization for RECPOINTS
   if(fSubDetector == 0 || fSubDetector == 1) {
-	AliDebug(1,"AliITSQADM:: SPD InitRecPoints\n");
+    AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SPD InitRecPoints\n");
     fSPDDataMaker->InitRecPoints();
   }
   if(fSubDetector == 0 || fSubDetector == 2) {
-	AliDebug(1,"AliITSQADM:: SDD InitRecPoints\n");
+    AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SDD InitRecPoints\n");
 	fSDDDataMaker->InitRecPoints();
   }
   if(fSubDetector == 0 || fSubDetector == 3) {
-	AliDebug(1,"AliITSQADM:: SSD InitRecPoints\n");
+    AliDebug(AliQAv1::GetQADebugLevel(),"AliITSQADM:: SSD InitRecPoints\n");
 	fSSDDataMaker->InitRecPoints();
   }
 }
@@ -412,7 +439,7 @@ void AliITSQADataMakerRec::MakeESDs(AliESDEvent *esd)
 
   // vertices
   const AliESDVertex *vtxSPD = esd->GetPrimaryVertexSPD();
-  const AliESDVertex *vtxTrk = esd->GetPrimaryVertex();
+  const AliESDVertex *vtxTrk = esd->GetPrimaryVertexTracks();
 
   Int_t mult = ((AliMultiplicity*)(esd->GetMultiplicity()))->GetNumberOfTracklets();
   if(mult>0)