From: mbroz <Michal.Broz@cern.ch>
Date: Wed, 26 Nov 2014 08:53:58 +0000 (+0100)
Subject: Central flags to digit and change of CIU position
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=a67ec576b9e8fe7382d82cdebedb550012e07ee2;p=u%2Fmrichter%2FAliRoot.git

Central flags to digit and change of CIU position
---

diff --git a/AD/AliADRawStream.cxx b/AD/AliADRawStream.cxx
index f9e9b3d479f..96d97e9b49b 100644
--- a/AD/AliADRawStream.cxx
+++ b/AD/AliADRawStream.cxx
@@ -126,7 +126,7 @@ Bool_t AliADRawStream::Next()
   Int_t iCIU=0;
   for (Int_t  iV0CIU = 0; iV0CIU < 8; iV0CIU++) {
     
-    if(iV0CIU != 1 || iV0CIU != 5) {
+    if(iV0CIU != 1 || iV0CIU != 3) {
       for(Int_t iWord = 0; iWord<182; iWord++) GetNextWord();
       continue;
       	}
diff --git a/AD/AliADReconstructor.cxx b/AD/AliADReconstructor.cxx
index c102723dd0c..c2ebd66c468 100644
--- a/AD/AliADReconstructor.cxx
+++ b/AD/AliADReconstructor.cxx
@@ -93,11 +93,6 @@ void AliADReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTre
   AliADRawStream rawStream(rawReader);
   if (rawStream.Next()) { 
 
-    Int_t aBBflagsADA = 0;
-    Int_t aBBflagsADC = 0;
-    Int_t aBGflagsADA = 0;
-    Int_t aBGflagsADC = 0;
-
     for(Int_t iChannel=0; iChannel < 16; ++iChannel) {
       Int_t offlineCh = rawStream.GetOfflineChannel(iChannel);
       // ADC charge samples
@@ -107,29 +102,18 @@ void AliADReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTre
       }
       // Integrator flag
       Bool_t integrator = rawStream.GetIntegratorFlag(iChannel,kNClocks/2);
-      // Beam-beam and beam-gas flags
-      if(offlineCh<8) {
-	if (rawStream.GetBBFlag(iChannel,kNClocks/2)) aBBflagsADC |= (1 << offlineCh);
-	if (rawStream.GetBGFlag(iChannel,kNClocks/2)) aBGflagsADC |= (1 << offlineCh);
-      } else {
-	if (rawStream.GetBBFlag(iChannel,kNClocks/2)) aBBflagsADA |= (1 << (offlineCh-32));
-	if (rawStream.GetBGFlag(iChannel,kNClocks/2)) aBGflagsADA |= (1 << (offlineCh-32));
-      }
+      Bool_t BBflag = rawStream.GetBBFlag(iChannel,kNClocks/2); 
+      Bool_t BGflag = rawStream.GetBGFlag(iChannel,kNClocks/2);
+   
       // HPTDC data (leading time and width)
       Int_t board = AliADCalibData::GetBoardNumber(offlineCh);
       Float_t time = rawStream.GetTime(iChannel)*fCalibData->GetTimeResolution(board);
       Float_t width = rawStream.GetWidth(iChannel)*fCalibData->GetWidthResolution(board);
       // Add a digit
       if(!fCalibData->IsChannelDead(iChannel)){
-	  new ((*fDigitsArray)[fDigitsArray->GetEntriesFast()]) AliADdigit(offlineCh, time, width,integrator, chargeADC);
+	  new ((*fDigitsArray)[fDigitsArray->GetEntriesFast()]) AliADdigit(offlineCh, time, width,integrator, chargeADC, BBflag, BGflag);
       }
     }
-    // Store the BB and BG flags in the digits tree (user info)
-    digitsTree->GetUserInfo()->Add(new TParameter<int>("BBflagsADA",aBBflagsADA));
-    digitsTree->GetUserInfo()->Add(new TParameter<int>("BBflagsADC",aBBflagsADC));
-    digitsTree->GetUserInfo()->Add(new TParameter<int>("BGflagsADA",aBGflagsADA));
-    digitsTree->GetUserInfo()->Add(new TParameter<int>("BGflagsADC",aBGflagsADC));
-
 
     digitsTree->Fill();
   }
diff --git a/AD/AliADdigit.cxx b/AD/AliADdigit.cxx
index cfad82fb723..0f0e56f88c5 100644
--- a/AD/AliADdigit.cxx
+++ b/AD/AliADdigit.cxx
@@ -24,7 +24,9 @@ AliADdigit::AliADdigit()
     fPMNumber(0),
     fTime(0.),
     fWidth(0.),
-    fIntegrator(0)
+    fIntegrator(0),
+    fBBflag(0),
+    fBGflag(0)
 
 {
   // Standard default
@@ -37,12 +39,16 @@ AliADdigit::AliADdigit(Int_t   PMnumber, Float_t time,
                              Float_t width,
 			     Bool_t integrator,
 			     Short_t *chargeADC,
+			     Bool_t  BBflag,
+		  	     Bool_t  BGflag,
 			     Int_t *labels)
 :AliDigit(),
 fPMNumber(PMnumber),
 fTime(time),
 fWidth(width),
-fIntegrator(integrator)
+fIntegrator(integrator),
+fBBflag(BBflag),
+fBGflag(BGflag)
 {  
   // Constructor
   // Used in the digitizer
diff --git a/AD/AliADdigit.h b/AD/AliADdigit.h
index 38a61a1de5c..e2debedbf04 100644
--- a/AD/AliADdigit.h
+++ b/AD/AliADdigit.h
@@ -17,6 +17,8 @@ public:
                   Float_t TimeWidth,
 		  Bool_t  Integrator,
 		  Short_t *chargeADC = 0,
+		  Bool_t  BBflag = kFALSE,
+		  Bool_t  BGflag = kFALSE,
 		  Int_t *labels = 0);
     virtual ~AliADdigit() {};
     virtual void Print(const Option_t* option="") const;
@@ -28,13 +30,18 @@ public:
     Bool_t  Integrator() const {return fIntegrator;}
     Short_t ChargeADC(Int_t clock) const {return (clock >= 0 && clock < kNClocks) ? fChargeADC[clock] : 0;}
     Bool_t  GetIntegratorFlag(Int_t clock);
+    Bool_t  GetBBflag()  const {return fBBflag;}
+    Bool_t  GetBGflag()  const {return fBGflag;}
     
   protected:
     Int_t   fPMNumber;      // PhotoMultiplier number (0 to 16)
     Float_t fTime;          // Time of Flight
     Float_t fWidth;         // Width of the time distribution
-    Bool_t  fIntegrator;    // Integrator used
+    Bool_t  fIntegrator;    // Integrator used in central clock
     Short_t fChargeADC[kNClocks]; // ADC samples as present in raw data
+    Bool_t  fBBflag;	    // BB flag in central clock
+    Bool_t  fBGflag;	    // BB flag in central clock
+    
 
   ClassDef(AliADdigit,1)  // AD Digit class
 };