From 5a4f221cba7b48cd95d48fd190a2a78d76d0f4bf Mon Sep 17 00:00:00 2001 From: cvetan Date: Mon, 25 Oct 2004 11:50:11 +0000 Subject: [PATCH 1/1] Fixes in alimdc package in order to be able to compile the code without HLT --- RAW/AliMDC.cxx | 30 +++++++++++++++++++++++++----- RAW/AliRawDB.cxx | 4 ++++ RAW/AliRawDB.h | 6 +++++- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/RAW/AliMDC.cxx b/RAW/AliMDC.cxx index a05580de3fa..8a79b19c69b 100644 --- a/RAW/AliMDC.cxx +++ b/RAW/AliMDC.cxx @@ -264,15 +264,35 @@ Int_t AliMDC::Run() // Create new raw DB. AliRawDB *rawdb; if (fWriteMode == kRFIO) - rawdb = new AliRawRFIODB(event, esd, fMaxFileSize, fCompress); + rawdb = new AliRawRFIODB(event, +#ifdef USE_HLT + esd, +#endif + fMaxFileSize, fCompress); else if (fWriteMode == kROOTD) - rawdb = new AliRawRootdDB(event, esd, fMaxFileSize, fCompress); + rawdb = new AliRawRootdDB(event, +#ifdef USE_HLT + esd, +#endif + fMaxFileSize, fCompress); else if (fWriteMode == kCASTOR) - rawdb = new AliRawCastorDB(event, esd, fMaxFileSize, fCompress); + rawdb = new AliRawCastorDB(event, +#ifdef USE_HLT + esd, +#endif + fMaxFileSize, fCompress); else if (fWriteMode == kDEVNULL) - rawdb = new AliRawNullDB(event, esd, fMaxFileSize, fCompress); + rawdb = new AliRawNullDB(event, +#ifdef USE_HLT + esd, +#endif + fMaxFileSize, fCompress); else - rawdb = new AliRawDB(event, esd, fMaxFileSize, fCompress); + rawdb = new AliRawDB(event, +#ifdef USE_HLT + esd, +#endif + fMaxFileSize, fCompress); if (rawdb->IsZombie()) return 1; printf("Filling raw DB %s\n", rawdb->GetDBName()); diff --git a/RAW/AliRawDB.cxx b/RAW/AliRawDB.cxx index 28a128e5adf..1b991564ced 100644 --- a/RAW/AliRawDB.cxx +++ b/RAW/AliRawDB.cxx @@ -56,7 +56,9 @@ AliRawDB::AliRawDB(AliRawEvent *event, // Create a new raw DB containing at most maxsize bytes. fEvent = event; +#ifdef USE_HLT fESD = esd; +#endif fMaxSize = maxsize; fCompress = compress; @@ -261,7 +263,9 @@ void AliRawDB::Close() // Write the tree. fTree->Write(); +#ifdef USE_HLT fESDTree->Write(); +#endif // Close DB, this also deletes the fTree fRawDB->Close(); diff --git a/RAW/AliRawDB.h b/RAW/AliRawDB.h index bfc182502a9..8ae6b53b0f8 100644 --- a/RAW/AliRawDB.h +++ b/RAW/AliRawDB.h @@ -49,7 +49,11 @@ public: virtual Int_t GetNetopt() const { return 0; } virtual Bool_t Create(); virtual void Close(); - void Fill() { fTree->Fill(); fESDTree->Fill(); } + void Fill() { fTree->Fill(); +#ifdef USE_HLT + fESDTree->Fill(); +#endif + } Bool_t FileFull() { return (fRawDB->GetBytesWritten() > fMaxSize) ? kTRUE : kFALSE; } -- 2.31.1