Additional protections, corrected ownership of the reco. parameters (needed to run...

[u/mrichter/AliRoot.git] / ACORDE / AliACORDERawData.cxx

diff --git a/ACORDE/AliACORDERawData.cxx b/ACORDE/AliACORDERawData.cxx
index 38b388225a27919b6738c80f9a50a7c54f695fbe..166d76da1f50a04a870aa6b3fa197ddd30751a48 100644 (file)
--- a/ACORDE/AliACORDERawData.cxx
+++ b/ACORDE/AliACORDERawData.cxx
@@ -34,7 +34,7 @@
 #include "AliACORDERawData.h"
 #include "AliDAQ.h"
 #include "AliFstream.h"
-#include "AliRawDataHeader.h"
+#include "AliRawDataHeaderSim.h"
 
 
 ClassImp(AliACORDERawData)
@@ -72,18 +72,18 @@ 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);
   AliFstream* fFile = new AliFstream(fileName);
 
   // write header
-  AliRawDataHeader header;
+  AliRawDataHeaderSim header;
   UInt_t header_position = fFile->Tellp();
   fFile->WriteBuffer((char*)(&header), sizeof(header));
 
@@ -102,23 +102,23 @@ 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
-  fWord10|=(1<<30);
-  fWord12|=(1<<30);
-  fWord11|=(1<<31);
-  fWord12|=(1<<31);
+  fWord10|=(unsigned int)(1<<30);
+  fWord12|=(unsigned int)(1<<30);
+  fWord11|=(unsigned int)(1<<31); 
+  fWord12|=(unsigned int)(1<<31);
 }