From 54baf07bfbd2f911d60a2e627c963074bbd5f267 Mon Sep 17 00:00:00 2001
From: cvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 9 May 2008 13:32:11 +0000
Subject: [PATCH] Correct treatment of single and multi muon information
 (raw->digits and digits->raw fixed)

---
 ACORDE/AliACORDE.cxx              |  2 +-
 ACORDE/AliACORDERawData.cxx       | 10 +++++-----
 ACORDE/AliACORDERawData.h         |  4 ++--
 ACORDE/AliACORDEReconstructor.cxx |  4 ----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ACORDE/AliACORDE.cxx b/ACORDE/AliACORDE.cxx
index 5d73d8e5c19..6c820050be7 100644
--- a/ACORDE/AliACORDE.cxx
+++ b/ACORDE/AliACORDE.cxx
@@ -281,7 +281,7 @@ void AliACORDE::Digits2Raw()
 
   // 4. Write raw data
   AliACORDERawData rawdata;
-  rawdata.WriteACORDERawData(Modules);
+  rawdata.WriteACORDERawData(Modules,(ndig > 1));
 }
 
 //_____________________________________________________________________________
diff --git a/ACORDE/AliACORDERawData.cxx b/ACORDE/AliACORDERawData.cxx
index 4ed2acec871..ab3075f0a89 100644
--- a/ACORDE/AliACORDERawData.cxx
+++ b/ACORDE/AliACORDERawData.cxx
@@ -72,11 +72,11 @@ AliACORDERawData &AliACORDERawData::operator=(const AliACORDERawData &r)
   return *this;
 }
 
-void AliACORDERawData::WriteACORDERawData(Bool_t *b)
+void AliACORDERawData::WriteACORDERawData(Bool_t *b,Bool_t multi)
 
 {
   // set words
-  SetACORDERawWords(b);
+  SetACORDERawWords(b,multi);
 
   // open output file
   const char *fileName = AliDAQ::DdlFileName("ACORDE",0);
@@ -102,18 +102,18 @@ void AliACORDERawData::WriteACORDERawData(Bool_t *b)
   fFile->Seekp(current_position);
 }
 
-void AliACORDERawData::SetACORDERawWords(Bool_t *b)
+void AliACORDERawData::SetACORDERawWords(Bool_t *b,Bool_t multi)
 
 {
   // set modules
   for (Int_t i=0;i<30;i++) {
     if (b[i]) {
       fWord9|=(1<<i);
-      fWord11|=(1<<i);
+      if (multi) fWord11|=(1<<i);
     }
     if (b[i+30]) {
       fWord10|=(1<<i);
-      fWord12|=(1<<i);
+      if (multi) fWord12|=(1<<i);
     }
   } // end for
   // set labels
diff --git a/ACORDE/AliACORDERawData.h b/ACORDE/AliACORDERawData.h
index 653daf4fd10..b95b8c98956 100644
--- a/ACORDE/AliACORDERawData.h
+++ b/ACORDE/AliACORDERawData.h
@@ -22,8 +22,8 @@ class AliACORDERawData : public TObject {
   virtual ~AliACORDERawData();
   AliACORDERawData &operator=(const AliACORDERawData &r);      // ass. op.
 
-  void WriteACORDERawData(Bool_t *b);
-  void SetACORDERawWords(Bool_t *b);
+  void WriteACORDERawData(Bool_t *b,Bool_t multi);
+  void SetACORDERawWords(Bool_t *b,Bool_t multi);
   
 
  private:
diff --git a/ACORDE/AliACORDEReconstructor.cxx b/ACORDE/AliACORDEReconstructor.cxx
index de3b85e89a1..692da258492 100644
--- a/ACORDE/AliACORDEReconstructor.cxx
+++ b/ACORDE/AliACORDEReconstructor.cxx
@@ -90,10 +90,6 @@ void AliACORDEReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digit
       Int_t  bit   = iChannel % 30;
       if (rawStream.GetWord(index) & (1 << bit))
         new ((*digitsArray)[digitsArray->GetEntriesFast()]) AliACORDEdigit(iChannel+1,0);
-      // separate digits for single and multi muon signals !!!
-      // TO BE DONE!!
-      // if (GetWord(index+1) & (1 << bit))
-      // new ((*digitsArray)[digitsArray->GetEntriesFast()]) AliACORDEdigit(iChannel+1,0); // multi-muon digit
     }
   }
 
-- 
2.39.3