From f7ee745b8b562786bc03563c4a142f000250fdef Mon Sep 17 00:00:00 2001 From: cvetan Date: Tue, 27 Nov 2007 16:13:59 +0000 Subject: [PATCH] Use CDH object in which the trigger information is already filled in (AliRawDataHeaderSim) --- ACORDE/AliACORDERawData.cxx | 4 ++-- FMD/AliFMDAltroIO.cxx | 6 +++--- HMPID/AliHMPIDRawStream.h | 3 ++- ITS/AliITSDDLRawData.cxx | 8 ++++---- MUON/AliMUONRawWriter.h | 4 ++-- PMD/AliPMDDDLRawData.cxx | 4 ++-- STEER/AliCTPRawData.cxx | 4 ++-- TPC/AliTPCDDLRawData.cxx | 1 - TRD/AliTRDrawData.cxx | 4 ++-- VZERO/AliVZEROBuffer.cxx | 6 +++--- ZDC/AliZDC.cxx | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ACORDE/AliACORDERawData.cxx b/ACORDE/AliACORDERawData.cxx index 38b388225a2..4ed2acec871 100644 --- 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) @@ -83,7 +83,7 @@ void AliACORDERawData::WriteACORDERawData(Bool_t *b) AliFstream* fFile = new AliFstream(fileName); // write header - AliRawDataHeader header; + AliRawDataHeaderSim header; UInt_t header_position = fFile->Tellp(); fFile->WriteBuffer((char*)(&header), sizeof(header)); diff --git a/FMD/AliFMDAltroIO.cxx b/FMD/AliFMDAltroIO.cxx index d434e3de43f..dae103de08e 100644 --- a/FMD/AliFMDAltroIO.cxx +++ b/FMD/AliFMDAltroIO.cxx @@ -23,7 +23,7 @@ // Mapping of ALTRO hardware channel to detector coordinates // #include "AliFMDAltroIO.h" -#include +#include #include #include "AliLog.h" #include @@ -310,7 +310,7 @@ AliFMDAltroWriter::AliFMDAltroWriter(std::ostream& stream) // Write a dummy header fHeader = fOutput.tellp(); if (fOutput.bad()) throw -kBadTell; - AliRawDataHeader header; + AliRawDataHeaderSim header; fOutput.write((char*)(&header), sizeof(header)); if (fOutput.bad()) throw -kBadWrite; fBegin = fOutput.tellp(); @@ -342,7 +342,7 @@ AliFMDAltroWriter::Close() if (fOutput.bad()) return -kBadTell; fOutput.seekp(fHeader, std::ios_base::beg); if (fOutput.bad()) return -kBadSeek; - AliRawDataHeader header; + AliRawDataHeaderSim header; header.fSize = (UShort_t(end) - fHeader); AliFMDDebug(15, ("Size set to %d (%d)", header.fSize, fTotal)); header.SetAttribute(0); diff --git a/HMPID/AliHMPIDRawStream.h b/HMPID/AliHMPIDRawStream.h index 6f1b4b87282..a3ece7b242b 100644 --- a/HMPID/AliHMPIDRawStream.h +++ b/HMPID/AliHMPIDRawStream.h @@ -19,6 +19,7 @@ #include #include "AliHMPIDDigit.h" #include "AliDAQ.h" +#include "AliRawDataHeaderSim.h" class AliRawReader; class AliHMPIDRawStream: public TObject { @@ -310,7 +311,7 @@ void AliHMPIDRawStream::WriteRaw(TObjArray *pDigAll) AliFstream* ddlL; //output streams, 2 per chamber AliFstream* ddlR; - AliRawDataHeader header; header.SetAttribute(0); //empty DDL header + AliRawDataHeaderSim header; header.SetAttribute(0); //empty DDL header ddlL = new AliFstream(AliDAQ::DdlFileName("HMPID",2*iCh+1)); //left and right looking at the IP ddlR = new AliFstream(AliDAQ::DdlFileName("HMPID",2*iCh)); //open both DDL of this chamber in parallel diff --git a/ITS/AliITSDDLRawData.cxx b/ITS/AliITSDDLRawData.cxx index dbc33469136..499205e853f 100644 --- a/ITS/AliITSDDLRawData.cxx +++ b/ITS/AliITSDDLRawData.cxx @@ -28,7 +28,7 @@ #include #include "AliITSdigit.h" #include "AliITSDDLRawData.h" -#include "AliRawDataHeader.h" +#include "AliRawDataHeaderSim.h" #include "AliITSRawStreamSPD.h" #include "AliITSRawStreamSDD.h" #include "AliITSRawStreamSSD.h" @@ -487,7 +487,7 @@ Int_t AliITSDDLRawData::RawDataSPD(TBranch* branch){ TClonesArray*& digits = * (TClonesArray**) branch->GetAddress(); char fileName[15]; AliFstream* outfile; // logical name of the output file - AliRawDataHeader header; + AliRawDataHeaderSim header; //loop over DDLs for(Int_t i=0;iGetAddress(); char fileName[15]; AliFstream* outfile; // logical name of the output file - AliRawDataHeader header; + AliRawDataHeaderSim header; //loop over DDLs for(Int_t i=0;iGetAddress(); char fileName[15]; AliFstream* outfile; // logical name of the output file - AliRawDataHeader header; + AliRawDataHeaderSim header; UInt_t skippedword, carlosFooterWord,fifoFooterWord,jitterWord; Bool_t retcode; retcode = AliBitPacking::PackWord(0x3FFFFFFF,carlosFooterWord,0,31); diff --git a/MUON/AliMUONRawWriter.h b/MUON/AliMUONRawWriter.h index 3358813db86..9e76a945cb4 100644 --- a/MUON/AliMUONRawWriter.h +++ b/MUON/AliMUONRawWriter.h @@ -12,7 +12,7 @@ // Author Christian Finck and Laurent Aphecetche, Subatech #include -#include "AliRawDataHeader.h" +#include "AliRawDataHeaderSim.h" #include "AliFstream.h" class AliMUONBlockHeader; @@ -70,7 +70,7 @@ private: Bool_t fScalerEvent; ///< flag to generates scaler event - AliRawDataHeader fHeader; ///< header of DDL + AliRawDataHeaderSim fHeader; ///< header of DDL Int_t fBufferSize; //!< size of internal data buffer Int_t* fBuffer; //!< internal data buffer diff --git a/PMD/AliPMDDDLRawData.cxx b/PMD/AliPMDDDLRawData.cxx index 32aaae91f1e..c96ba18d3f9 100644 --- a/PMD/AliPMDDDLRawData.cxx +++ b/PMD/AliPMDDDLRawData.cxx @@ -22,7 +22,7 @@ #include #include "AliLog.h" -#include "AliRawDataHeader.h" +#include "AliRawDataHeaderSim.h" #include "AliBitPacking.h" #include "AliPMDdigit.h" #include "AliPMDBlockHeader.h" @@ -90,7 +90,7 @@ void AliPMDDDLRawData::WritePMDRawData(TTree *treeD) Int_t modulePerDDL = 0; - AliRawDataHeader header; + AliRawDataHeaderSim header; UInt_t sizeRawData = 0; const Int_t kSize = 1536; diff --git a/STEER/AliCTPRawData.cxx b/STEER/AliCTPRawData.cxx index e55fa57ce1d..3f54506e97a 100644 --- a/STEER/AliCTPRawData.cxx +++ b/STEER/AliCTPRawData.cxx @@ -25,7 +25,7 @@ #include "AliCTPRawData.h" #include "AliRunLoader.h" #include "AliCentralTrigger.h" -#include "AliRawDataHeader.h" +#include "AliRawDataHeaderSim.h" #include "AliLog.h" #include "AliDAQ.h" #include "AliFstream.h" @@ -90,7 +90,7 @@ void AliCTPRawData::RawData() AliFstream* outfile; // logical name of the output file outfile = new AliFstream(fileName); - AliRawDataHeader header; + AliRawDataHeaderSim header; // Write a dummy header UInt_t dataHeaderPosition=outfile->Tellp(); outfile->WriteBuffer((char*)(&header),sizeof(header)); diff --git a/TPC/AliTPCDDLRawData.cxx b/TPC/AliTPCDDLRawData.cxx index a248730965f..dcec79dfcc0 100644 --- a/TPC/AliTPCDDLRawData.cxx +++ b/TPC/AliTPCDDLRawData.cxx @@ -30,7 +30,6 @@ #include "AliAltroBuffer.h" #include "AliTPCAltroMapping.h" #include "AliTPCDDLRawData.h" -#include "AliRawDataHeader.h" #include "AliDAQ.h" ClassImp(AliTPCDDLRawData) diff --git a/TRD/AliTRDrawData.cxx b/TRD/AliTRDrawData.cxx index 03186a2bd3d..df328b5985c 100644 --- a/TRD/AliTRDrawData.cxx +++ b/TRD/AliTRDrawData.cxx @@ -27,7 +27,7 @@ #include "TClass.h" #include "AliDAQ.h" -#include "AliRawDataHeader.h" +#include "AliRawDataHeaderSim.h" #include "AliRawReader.h" #include "AliLog.h" #include "AliFstream.h" @@ -163,7 +163,7 @@ Bool_t AliTRDrawData::Digits2Raw(AliTRDdigitsManager *digitsManager) AliFstream* of = new AliFstream(name); // Write a dummy data header - AliRawDataHeader header; // the event header + AliRawDataHeaderSim header; // the event header UInt_t hpos = of->Tellp(); of->WriteBuffer((char *) (& header), sizeof(header)); diff --git a/VZERO/AliVZEROBuffer.cxx b/VZERO/AliVZEROBuffer.cxx index c3146339537..40014bf9aeb 100644 --- a/VZERO/AliVZEROBuffer.cxx +++ b/VZERO/AliVZEROBuffer.cxx @@ -23,7 +23,7 @@ #include #include #include "AliLog.h" -#include "AliRawDataHeader.h" +#include "AliRawDataHeaderSim.h" #include "AliVZEROBuffer.h" //#include "TFile.h" @@ -49,7 +49,7 @@ AliVZEROBuffer::AliVZEROBuffer(const char* fileName):TObject(), f = new AliFstream(fileName); // fout=new TFile(fileName,"recreate"); // tree=new TTree("tree","Values"); - AliRawDataHeader header; + AliRawDataHeaderSim header; f->WriteBuffer((char*)(&header), sizeof(header)); } @@ -57,7 +57,7 @@ AliVZEROBuffer::AliVZEROBuffer(const char* fileName):TObject(), //_____________________________________________________________________________ AliVZEROBuffer::~AliVZEROBuffer(){ // Destructor, it closes the IO stream - AliRawDataHeader header; + AliRawDataHeaderSim header; header.fSize = f->Tellp(); header.SetAttribute(0); // valid data f->Seekp(0); diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx index 6c006c9fa9b..a51537f3955 100644 --- a/ZDC/AliZDC.cxx +++ b/ZDC/AliZDC.cxx @@ -36,7 +36,7 @@ // --- AliRoot header files #include "AliDetector.h" -#include "AliRawDataHeader.h" +#include "AliRawDataHeaderSim.h" #include "AliRawReader.h" #include "AliLoader.h" #include "AliRun.h" @@ -597,7 +597,7 @@ void AliZDC::Digits2Raw() AliFstream* file = new AliFstream(fileName); // write the DDL data header - AliRawDataHeader header; + AliRawDataHeaderSim header; header.fSize = sizeof(header) + sizeof(lADCHeader1) + sizeof(lADCData1) + sizeof(lADCEndBlock) + sizeof(lADCHeader2) + sizeof(lADCData2) + sizeof(lADCEndBlock) + -- 2.43.0