X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ACORDE%2FAliACORDEQADataMakerSim.cxx;h=244d54e3e35bc3b2afb8c77daaaab4b73197f693;hb=0f0c06decf346fc5c7f1c4840dec1d337a8fdf68;hp=d73a80daa6ce19817522e0b2ebbb22608dbcf922;hpb=eca4fa66e575b53a72c027046dc9ea60487c3240;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ACORDE/AliACORDEQADataMakerSim.cxx b/ACORDE/AliACORDEQADataMakerSim.cxx
index d73a80daa6c..244d54e3e35 100755
--- a/ACORDE/AliACORDEQADataMakerSim.cxx
+++ b/ACORDE/AliACORDEQADataMakerSim.cxx
@@ -89,10 +89,29 @@ void AliACORDEQADataMakerSim::InitHits()
 	
   const Bool_t expert   = kTRUE ; 
   const Bool_t image    = kTRUE ; 
-	
-  TH1F *   fHitsACORDE;
-	fHitsACORDE = new TH1F("hACORDEBitPattern","Distribution of fired modules;# of modules;Counts",60,0,60);
+  
+  TH1F * fHitsACORDE;  
+
+	fHitsACORDE = new TH1F("ACORDEBitPatternfromHits","Distribution of ACORDE fired modules from HITS",60,1,60);
 	Add2HitsList(fHitsACORDE,0,!expert,image);
+
+      	char *acoModule[60]={"0_0","0_1","0_2","0_3","0_4","0_5","0_6","0_7","0_8","0_9",
+                        "1_0","1_1","1_2","1_3","1_4","1_5","1_6","1_7","1_8","1_9",
+                        "2_0","2_1","2_2","2_3","2_4","2_5","2_6","2_7","2_8","2_9",
+                        "3_0","3_1","3_2","3_3","3_4","3_5","3_6","3_7","3_8","3_9",
+                        "4_0","4_1","4_2","4_3","4_4","4_5","4_6","4_7","4_8","4_9",
+                        "5_0","5_1","5_2","5_3","5_4","5_5","5_6","5_7","5_8","5_9"};
+
+
+	fHitsACORDE->SetXTitle("Modules");
+        fHitsACORDE->SetYTitle("Counts");
+        for (Int_t i=0;i<60;i++)
+        {
+                fHitsACORDE->GetXaxis()->SetBinLabel(i+1,acoModule[i]);
+        }
+
+
+
 }
 //____________________________________________________________________________ 
 void AliACORDEQADataMakerSim::InitDigits()
@@ -103,10 +122,23 @@ void AliACORDEQADataMakerSim::InitDigits()
   const Bool_t image    = kTRUE ; 
   
   TH1F *    fhDigitsModule;
-  TString   modulename;
-  modulename = "hDigitsModule";
-  fhDigitsModule = new TH1F(modulename.Data(),"hDigitsModuleSingle;# of modules;Counts",60,0,60);
+  fhDigitsModule = new TH1F("ACORDEBitPatternfromDigits","Distribution of ACORDE fired modules from DIGITS",60,1,60);
   Add2DigitsList(fhDigitsModule,0,!expert,image);
+  char *acoModule[60]={"0_0","0_1","0_2","0_3","0_4","0_5","0_6","0_7","0_8","0_9",
+                        "1_0","1_1","1_2","1_3","1_4","1_5","1_6","1_7","1_8","1_9",
+                        "2_0","2_1","2_2","2_3","2_4","2_5","2_6","2_7","2_8","2_9",
+                        "3_0","3_1","3_2","3_3","3_4","3_5","3_6","3_7","3_8","3_9",
+                        "4_0","4_1","4_2","4_3","4_4","4_5","4_6","4_7","4_8","4_9",
+                        "5_0","5_1","5_2","5_3","5_4","5_5","5_6","5_7","5_8","5_9"};
+
+
+	fhDigitsModule->SetXTitle("Modules");
+        fhDigitsModule->SetYTitle("Counts");
+        for (Int_t i=0;i<60;i++)
+        {
+                fhDigitsModule->GetXaxis()->SetBinLabel(i+1,acoModule[i]);
+        }
+
 
 }
 //____________________________________________________________________________
@@ -115,54 +147,57 @@ void AliACORDEQADataMakerSim::MakeHits(TTree *hitTree)
 {
   // Here we fill the QA histos for Hits declared above
 
-	TClonesArray * hits = new TClonesArray("AliACORDEhit",1000);
+	if (fHitsArray) 
+    	fHitsArray->Clear() ; 
+  	else
+    	fHitsArray = new TClonesArray("AliACORDEhit",1000);
 	TBranch * branch = hitTree->GetBranch("ACORDE");
-	if (!branch) {
+	if (!branch) 
+	{
 		AliWarning("ACORDE branch in Hit Tree not found");
-	} else {
-    
-    // Check id histograms already created for this Event Specie
-    if ( ! GetHitsData(0) )
-      InitHits() ;
-
-    branch->SetAddress(&hits);
-		for(Int_t track = 0 ; track < branch->GetEntries() ; track++) {
+	} else 
+	{
+    		branch->SetAddress(&fHitsArray);
+		for(Int_t track = 0 ; track < branch->GetEntries() ; track++) 
+		{
 			branch->GetEntry(track);
-			for(Int_t ihit=0 ; ihit < hits->GetEntriesFast() ; ihit++) {
-				AliACORDEhit *AcoHit = (AliACORDEhit*) hits->UncheckedAt(ihit);
-				if(!AcoHit) {
+			for(Int_t ihit=0 ; ihit < fHitsArray->GetEntriesFast() ; ihit++) 
+			{
+				AliACORDEhit *AcoHit = (AliACORDEhit*) fHitsArray->UncheckedAt(ihit);
+				if(!AcoHit) 
+				{
 					AliError("The unchecked hit doesn't exist");
 					continue ;
 				}
-				GetHitsData(0)->Fill(AcoHit->GetModule()-1);
-      }
-    }
-  }
+				GetHitsData(0)->Fill(AcoHit->GetModule());
+      			}			
+    		}
+  	}
+
 }
 //____________________________________________________________________________
 void AliACORDEQADataMakerSim::MakeDigits( TTree *digitsTree)
 {
   //fills QA histos for Digits
-  TClonesArray * digits = new TClonesArray("AliACORDEdigit",1000);
+  if (fDigitsArray) 
+    fDigitsArray->Clear() ; 
+  else
+    fDigitsArray = new TClonesArray("AliACORDEdigit",1000);
+  
   TBranch * branch = digitsTree->GetBranch("ACORDEdigit");
   if (!branch) {
     AliWarning("ACORDE branch in Digits Tree not found");
   } else {
- 
-    // Check id histograms already created for this Event Specie
-    if ( ! GetDigitsData(0) )
-      InitDigits() ;
-
-    branch->SetAddress(&digits);
+   branch->SetAddress(&fDigitsArray);
     for(Int_t track = 0 ; track < branch->GetEntries() ; track++) {
       branch->GetEntry(track);
-      for(Int_t idigit = 0 ; idigit < digits->GetEntriesFast() ; idigit++) {
-        AliACORDEdigit *AcoDigit = (AliACORDEdigit*) digits->UncheckedAt(idigit);
+      for(Int_t idigit = 0 ; idigit < fDigitsArray->GetEntriesFast() ; idigit++) {
+        AliACORDEdigit *AcoDigit = (AliACORDEdigit*) fDigitsArray->UncheckedAt(idigit);
         if (!AcoDigit) {
           AliError("The unchecked digit doesn't exist");
           continue ;
         }
-        GetDigitsData(0)->Fill(AcoDigit->GetModule()-1);
+        GetDigitsData(0)->Fill(AcoDigit->GetModule());
       }
     }
   }