X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSBeamTestDigSPD.cxx;h=62212fb518c827c9d27dcfda4a657347922777a5;hb=b0e25852769a15330f327ed7af0c652a80fdb908;hp=d0da3f9a4722b8ceac1b88c5962152fc3828889f;hpb=7d62fb642e8e534a0745ecf2706ee54afa6ffa5c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSBeamTestDigSPD.cxx b/ITS/AliITSBeamTestDigSPD.cxx
index d0da3f9a472..62212fb518c 100644
--- a/ITS/AliITSBeamTestDigSPD.cxx
+++ b/ITS/AliITSBeamTestDigSPD.cxx
@@ -6,6 +6,8 @@
 //                                                //
 ////////////////////////////////////////////////////
 
+/* $Id$ */
+
 #include "AliITSdigitSPD.h"
 #include "AliRawReader.h"
 #include "AliRawReader.h"
@@ -21,23 +23,19 @@ ClassImp(AliITSBeamTestDigSPD)
 
 
 //_____________________________________________________________
-  AliITSBeamTestDigSPD::AliITSBeamTestDigSPD(): AliITSBeamTestDig()
-{
+  AliITSBeamTestDigSPD::AliITSBeamTestDigSPD(): AliITSBeamTestDig(),
+fFlagHeader(0){
   //
   // Constructor
   //
-
-  
 }
 
 //_____________________________________________________________
-  AliITSBeamTestDigSPD::AliITSBeamTestDigSPD(const Text_t* name, const Text_t* title): AliITSBeamTestDig(name,title)
-{
+AliITSBeamTestDigSPD::AliITSBeamTestDigSPD(const Text_t* name, const Text_t* title): AliITSBeamTestDig(name,title),
+fFlagHeader(0){
   //
   // Constructor
   //
-
- 
 }
 
 //__________________________________________________________________
@@ -69,9 +67,10 @@ void AliITSBeamTestDigSPD::Exec(Option_t* /*opt*/)
     for(Int_t nlad=1;nlad<=fITSgeom->GetNladders(nlay);nlad++){
       for(Int_t ndet=1;ndet<=fITSgeom->GetNdetectors(nlay);ndet++){
 	Int_t index=fITSgeom->GetModuleIndex(nlay,nlad,ndet);
-	if(fITSgeom->GetModuleTypeName(index)=="kSPD") nspd++;
-	if(fITSgeom->GetModuleTypeName(index)=="kSDD") nsdd++;
-	if(fITSgeom->GetModuleTypeName(index)=="kSSD") nssd++;
+	TString dtype(fITSgeom->GetModuleTypeName(index));
+	if(dtype.Contains("SPD")) nspd++;
+	if(dtype.Contains("SDD")) nsdd++;
+	if(dtype.Contains("SSD")) nssd++;
       }
     }
   }
@@ -90,15 +89,15 @@ void AliITSBeamTestDigSPD::Exec(Option_t* /*opt*/)
 
   AliITSRawStreamSPD str(fReader);
 
-  fReader->SelectEquipment(17,211,211);
+  // fReader->SelectEquipment(17,0,19);
 
   while(str.Next()){  
 
     const AliRawDataHeader* rdh = fReader->GetDataHeader();
     UChar_t blockAttributes = fReader->GetBlockAttributes();     
     UInt_t statusBits = fReader->GetStatusBits();     
-    UInt_t orbitNumber = rdh->fEventID2; 			 
-    UShort_t  bunchCross = rdh->fEventID1;      
+    UInt_t orbitNumber = rdh->GetEventID2(); 			 
+    UShort_t  bunchCross = rdh->GetEventID1();      
       // UInt_t DataSize = rdh->fSize;				      
       //UChar_t L1TrigType = rdh->fL1TriggerType;			      
       //UInt_t MiniEvId = rdh->GetMiniEventID();			      
@@ -131,11 +130,11 @@ void AliITSBeamTestDigSPD::Exec(Option_t* /*opt*/)
       //fITSHeader->SetSubDet(0,Subdets);
       //fITSHeader->SetL1TriggerType(0,L1TrigType);
 
-   // fITSHeader->SetOrbitNumberSPD(OrbitNumber);
-         //printf("Bunch Crossing  = %x\n ",BunchCross);
-     if ( blockAttributes != 0x3a ) {
-       Info("Exec","Block Attribs  = %x\n ",blockAttributes);
-     }  
+      //fITSHeader->SetOrbitNumberSPD(OrbitNumber);
+      //printf("Bunch Crossing  = %x\n ",BunchCross);
+      //if ( blockAttributes != 0x3a ) {
+      //Info("Exec","Block Attribs  = %x\n ",blockAttributes);
+      //}