Compilation on Alpha
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 10 May 2004 13:24:44 +0000 (13:24 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 10 May 2004 13:24:44 +0000 (13:24 +0000)
HLT/comp/AliL3FitUtilities.c
HLT/hlt.conf
HLT/hough/AliL3Histogram1D.cxx
HLT/hough/AliL3HoughMaxFinder.cxx
HLT/misc/AliL3DDLRawReaderFile.cxx
HLT/src/AliL3RawDataFileHandler.cxx

index 1d3aa08..912bde3 100644 (file)
@@ -1,9 +1,9 @@
 
-#include "AliL3FitUtilities.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <setjmp.h>
+#include "AliL3FitUtilities.h"
 
 
 jmp_buf env;
index a252431..e61e2f0 100644 (file)
@@ -2,7 +2,7 @@
 # $Id$
 
 HLTDEFS     := -Duse_aliroot -Duse_root -Ddo_mc -DROWHOUGH\
-               -Duse_newio -D${ALICE_TARGET} -DROOTVERSION=\"unchecked\" \
+               -Duse_newio -DROOTVERSION=\"unchecked\" \
                -DALIROOTVERSION=\"unchecked\"
 
 HLTCXXFLAGS := $(filter-out -ansi,$(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))))
index 3933b0e..d65ca9e 100644 (file)
@@ -68,7 +68,11 @@ AliL3Histogram1D::~AliL3Histogram1D()
 
 void AliL3Histogram1D::Reset()
 {
+#if defined(__DECCXX)
+  bzero((char *)fContent,fNcells*sizeof(Double_t));
+#else
   bzero(fContent,fNcells*sizeof(Double_t));
+#endif
   fEntries=0;
 }
 
index 1b21f36..0243053 100644 (file)
@@ -843,7 +843,11 @@ void AliL3HoughMaxFinder::FindPeak1(Int_t y_window,Int_t x_bin_sides)
   for(Int_t i=0; i<nbinsx; i++)
     {
       windowPt[i] = new AxisWindow;
+#if defined(__DECCXX)
+      bzero((char *)windowPt[i],sizeof(AxisWindow));
+#else
       bzero((void*)windowPt[i],sizeof(AxisWindow));
+#endif
       anotherPt[i] = windowPt[i];
     }
   
index ae0a696..6d024d0 100644 (file)
@@ -50,7 +50,11 @@ AliL3DDLRawReaderFile::AliL3DDLRawReaderFile(const Char_t* name, Bool_t addnum)
   strcpy(fFileName,name);
   if (!addnum) {
     fFileNumber = -1;
+#ifndef __DECCXX
     fStream = new fstream(fFileName, ios::binary|ios::in);
+#else
+    fStream = new fstream(fFileName, ios::in);
+#endif
   } else {
     fFileNumber = 0;
     fStream = NULL;
@@ -67,7 +71,11 @@ AliL3DDLRawReaderFile::~AliL3DDLRawReaderFile()
   if(fFileName) delete fFileName;
 
   if (fStream) {
+#if defined(__HP_aCC) || defined(__DECCXX)
+    if (fStream->rdbuf()->is_open()) fStream->close();
+#else
     if (fStream->is_open()) fStream->close();
+#endif
     delete fStream;
   }
   delete fMiniHeader;
@@ -77,7 +85,11 @@ AliL3DDLRawReaderFile::~AliL3DDLRawReaderFile()
 Bool_t AliL3DDLRawReaderFile::OpenNextFile()
 {
   if (fStream) {
+#if defined(__HP_aCC) || defined(__DECCXX)
+    if (fStream->rdbuf()->is_open()) fStream->close();
+#else
     if (fStream->is_open()) fStream->close();
+#endif
     delete fStream;
     fStream = NULL;
   }
@@ -91,8 +103,16 @@ Bool_t AliL3DDLRawReaderFile::OpenNextFile()
   Char_t fileName[1024];
   sprintf(fileName, "%s%d", fFileName, fFileNumber);
 
+#ifndef __DECCXX
   fStream = new fstream(fileName, ios::binary|ios::in);
+#else
+  fStream = new fstream(fileName, ios::in);
+#endif
+#if defined(__HP_aCC) || defined(__DECCXX)
+  return (fStream->rdbuf()->is_open());
+#else
   return (fStream->is_open());
+#endif
 }
 
 Bool_t AliL3DDLRawReaderFile::ReadMiniHeader()
@@ -157,7 +177,11 @@ Bool_t AliL3DDLRawReaderFile::Reset()
   // reset the current stream position to the beginning of the file
 
   if ((fFileNumber > 0) && fStream) {
+#if defined(__HP_aCC) || defined(__DECCXX)
+    if (fStream->rdbuf()->is_open()) fStream->close();
+#else
     if (fStream->is_open()) fStream->close();
+#endif
     delete fStream;
     fStream = NULL;
     fFileNumber = 0;
@@ -165,7 +189,11 @@ Bool_t AliL3DDLRawReaderFile::Reset()
 
   if (!fStream) {
     if (fFileNumber < 0) {
+#ifndef __DECCXX
       fStream = new fstream(fFileName, ios::binary|ios::in);
+#else
+      fStream = new fstream(fFileName, ios::in);
+#endif
     } else {
       if (!OpenNextFile()){
        LOG(AliL3Log::kError,"AliL3DDLRawReaderFile::Reset","Data")
index c2f4cb6..95c7e9a 100644 (file)
@@ -84,9 +84,17 @@ Bool_t AliL3RawDataFileHandler::SetRawInput(Char_t *name)
 
   //Open the raw data file with name.
   fInRaw = new ifstream();
+#ifndef __DECCXX
   fInRaw->open(name,fstream::binary);
+#else
+  fInRaw->open(name);
+#endif
 
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(!fInRaw->rdbuf()->is_open()){
+#else
   if(!fInRaw->is_open()){
+#endif
     LOG(AliL3Log::kError,"AliL3RawDataFileHandler::SetRawInput","File Open")
       <<"Pointer to ifstream = 0x0"<<ENDLOG;
     return kFALSE;
@@ -106,7 +114,11 @@ Bool_t AliL3RawDataFileHandler::SetRawInput(ifstream *file)
   //Open the raw data file with given file.
   fInRaw = file;
 
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(!fInRaw->rdbuf()->is_open()){
+#else
   if(!fInRaw->is_open()){
+#endif
     LOG(AliL3Log::kError,"AliL3RawDataFileHandler::SetRawInput","File Open")
       <<"Pointer to ifstream = 0x0"<<ENDLOG;
     return kFALSE;
@@ -122,7 +134,11 @@ void AliL3RawDataFileHandler::CloseRawInput()
       <<"Nothing to Close"<<ENDLOG;
     return;
   }
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(fInRaw->rdbuf()->is_open()) fInRaw->close();
+#else
   if(fInRaw->is_open()) fInRaw->close();
+#endif
   delete fInRaw;
   fInRaw = 0;
 }
@@ -136,9 +152,17 @@ Bool_t AliL3RawDataFileHandler::SetRawOutput(Char_t *name)
   }
 
   fOutRaw = new ofstream();
+#ifndef __DECCXX
   fOutRaw->open(name,fstream::binary);
+#else
+  fOutRaw->open(name);
+#endif
 
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(!fOutRaw->rdbuf()->is_open()){
+#else
   if(!fOutRaw->is_open()){
+#endif
     LOG(AliL3Log::kError,"AliL3RawDataFileHandler::SetRawOutput","File Open")
       <<"Pointer to ofstream = 0x0"<<ENDLOG;
     return kFALSE;
@@ -158,7 +182,11 @@ Bool_t AliL3RawDataFileHandler::SetRawOutput(ofstream *file)
   //Open the raw data file with given file.
   fOutRaw = file;
 
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(!fOutRaw->rdbuf()->is_open()){
+#else
   if(!fOutRaw->is_open()){
+#endif
     LOG(AliL3Log::kError,"AliL3RawDataFileHandler::SetRawOutput","File Open")
       <<"Pointer to ofstream = 0x0"<<ENDLOG;
     return kFALSE;
@@ -174,7 +202,11 @@ void AliL3RawDataFileHandler::CloseRawOutput()
       <<"Nothing to Close"<<ENDLOG;
     return;
   }
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(fOutRaw->rdbuf()->is_open()) fOutRaw->close();
+#else
   if(fOutRaw->is_open()) fOutRaw->close();
+#endif
   delete fOutRaw;
   fOutRaw = 0;
 }
@@ -190,9 +222,17 @@ Bool_t AliL3RawDataFileHandler::SetRawPedestalsInput(Char_t *name)
 
   //Open the raw data file with name.
   fInRawPed = new ifstream();
+#ifndef __DECCXX
   fInRawPed->open(name,fstream::binary);
+#else
+  fInRawPed->open(name);
+#endif
 
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(!fInRawPed->rdbuf()->is_open()){
+#else
   if(!fInRawPed->is_open()){
+#endif
     LOG(AliL3Log::kError,"AliL3RawDataFileHandler::SetRawPedestalsInput","File Open")
       <<"Pointer to ifstream = 0x0"<<ENDLOG;
     return kFALSE;
@@ -212,7 +252,11 @@ Bool_t AliL3RawDataFileHandler::SetRawPedestalsInput(ifstream *file)
   //Open the raw data file with given file.
   fInRawPed = file;
 
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(!fInRawPed->rdbuf()->is_open()){
+#else
   if(!fInRawPed->is_open()){
+#endif
     LOG(AliL3Log::kError,"AliL3RawDataFileHandler::SetRawPedestalsInput","File Open")
       <<"Pointer to ifstream = 0x0"<<ENDLOG;
     return kFALSE;
@@ -228,7 +272,11 @@ void AliL3RawDataFileHandler::CloseRawPedestalsInput()
       <<"Nothing to Close"<<ENDLOG;
     return;
   }
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(fInRawPed->rdbuf()->is_open()) fInRawPed->close();
+#else
   if(fInRawPed->is_open()) fInRawPed->close();
+#endif
   delete fInRawPed;
   fInRaw = 0;
 }
@@ -360,7 +408,11 @@ Int_t AliL3RawDataFileHandler::ReadRawInput()
     return 0; 
   }
 
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(!fInRaw->rdbuf()->is_open()){
+#else
   if(!fInRaw->is_open()){
+#endif
     LOG(AliL3Log::kError,"AliL3RawDataFileHandler::ReadRawInput","File Open")
       <<"No Input avalible: ifstream not opened"<<ENDLOG;
     return 0;
@@ -457,7 +509,11 @@ Int_t AliL3RawDataFileHandler::StoreRawData(Short_t **charges)
     return 0; 
   }
 
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(!fOutRaw->rdbuf()->is_open()){
+#else
   if(!fOutRaw->is_open()){
+#endif
     LOG(AliL3Log::kError,"AliL3RawDataFileHandler::StoreRawData","File Open")
       <<"No Output avalible: ofstream not opened"<<ENDLOG;
     return 0;
@@ -500,7 +556,11 @@ Int_t AliL3RawDataFileHandler::ReadRawPedestalsInput()
     return 0; 
   }
 
+#if defined(__HP_aCC) || defined(__DECCXX)
+  if(!fInRawPed->rdbuf()->is_open()){
+#else
   if(!fInRawPed->is_open()){
+#endif
     LOG(AliL3Log::kError,"AliL3RawDataFileHandler::ReadRawPedestalsInput","File Open")
       <<"No Input avalible: ifstream not opened"<<ENDLOG;
     return 0;