Fixes in alimdc package in order to be able to compile the code without HLT

diff --git a/RAW/AliMDC.cxx b/RAW/AliMDC.cxx
index a05580de3fabc42872d7158c505c1d606f9e0c22..8a79b19c69bb3cd291c523dd7f78de0a789d989c 100644 (file)
--- 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)
    // 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)
    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)
    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)
    else if (fWriteMode == kDEVNULL)

-      rawdb = new AliRawNullDB(event, esd, fMaxFileSize, fCompress);
+      rawdb = new AliRawNullDB(event,
+#ifdef USE_HLT
+                              esd,
+#endif
+                              fMaxFileSize, fCompress);

    else
    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());
 
    if (rawdb->IsZombie()) return 1;
    printf("Filling raw DB %s\n", rawdb->GetDBName());

diff --git a/RAW/AliRawDB.cxx b/RAW/AliRawDB.cxx
index 28a128e5adfc010c244c1c8badb9c3a1cc56cc20..1b991564cedb76b747c8fcaaf7dfcf36793a82ef 100644 (file)
--- 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;
    // Create a new raw DB containing at most maxsize bytes.
 
    fEvent    = event;

+#ifdef USE_HLT

    fESD      = esd;
    fESD      = esd;

+#endif

    fMaxSize  = maxsize;
    fCompress = compress;
 
    fMaxSize  = maxsize;
    fCompress = compress;
 


@@ -261,7 +263,9 @@ void AliRawDB::Close()
 
    // Write the tree.
    fTree->Write();
 
    // Write the tree.
    fTree->Write();

+#ifdef USE_HLT

    fESDTree->Write();
    fESDTree->Write();

+#endif

 
    // Close DB, this also deletes the fTree
    fRawDB->Close();
 
    // Close DB, this also deletes the fTree
    fRawDB->Close();

diff --git a/RAW/AliRawDB.h b/RAW/AliRawDB.h
index bfc182502a9a4dea4b36982de30f5f3e0d9054b4..8ae6b53b0f88040db189c857a4e0e51ca0564bfc 100644 (file)
--- 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();
    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; }
 
    Bool_t              FileFull() { return (fRawDB->GetBytesWritten() > fMaxSize) ?
                                     kTRUE : kFALSE; }