Changes in AliHLTPHOSBase classes, all Processors now inherits

from AliHLTPHOSConfig (hlt configuration), and AliHLTPHOSAltroConfig (FEE configuration)

diff --git a/HLT/PHOS/AliHLTPHOSConfig.cxx b/HLT/PHOS/AliHLTPHOSConfig.cxx
new file mode 100644 (file)
index 0000000..06b3cb1
--- /dev/null
+++ b/HLT/PHOS/AliHLTPHOSConfig.cxx
@@ -0,0 +1,75 @@
+/**************************************************************************
+ * This file is property of and copyright by the Experimental Nuclear     *
+ * Physics Group, Dep. of Physics                                         *
+ * University of Oslo, Norway, 2007                                       *
+ *                                                                        *
+ * Author: Per Thomas Hille <perthi@fys.uio.no> for the ALICE HLT Project.*
+ * Contributors are mentioned in the code where appropriate.              *
+ * Please report bugs to perthi@fys.uio.no                                *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+#include "AliHLTPHOSConfig.h"
+#include <stdio.h>
+
+
+AliHLTPHOSConfig::AliHLTPHOSConfig() : 
+  fIsSoftwareBaselineSubtraction(true)
+{
+  /*
+  FILE *fp = fopen("hltConfig.txt", "r");
+
+
+  if(fp == 0)
+    {
+      printf("\nAliHLTPHOSConfig::AliHLTPHOSConfig(): WARNING: Could not find file \"hltConfig.txt\" \n");
+      printf("Default values will be used\n");
+      PrintDefaultValues();
+    }
+  else
+    {
+      printf("Reading PHOS HLT configurations from file is no yest implemented\n");
+      printf("You can use Setter functions of  AliHLTPHOSConfig to set the appropriate parameters\n");
+      printf("See  AliHLTPHOSConfig.h for details\n");
+      printf("Using default values for the moment\n");
+      PrintDefaultValues(); 
+    }
+  */
+
+}
+
+
+AliHLTPHOSConfig::~AliHLTPHOSConfig()
+{
+
+}
+
+void 
+AliHLTPHOSConfig:: PrintDefaultValues()
+{
+  printf("\n AliHLTPHOSConfig Default  Values\n");
+
+
+  if(fIsSoftwareBaselineSubtraction == true)
+    {
+      printf("fisSoftwarebaselinesubtraction = true\n");
+    }
+  else
+    {
+      printf("fisSoftwarebaselinesubtraction == false\n");
+    }
+
+}
+
+
+void 
+AliHLTPHOSConfig::SetSoftwareBaselineSubtraction(bool isSoftwareBaselineSubtraction)
+{
+  fIsSoftwareBaselineSubtraction =  isSoftwareBaselineSubtraction;
+}

diff --git a/HLT/PHOS/AliHLTPHOSConfig.h b/HLT/PHOS/AliHLTPHOSConfig.h
new file mode 100644 (file)
index 0000000..00f438d
--- /dev/null
+++ b/HLT/PHOS/AliHLTPHOSConfig.h
@@ -0,0 +1,36 @@
+#ifndef ALIHLTPHOSCONFIG_H
+#define ALIHLTPHOSCONFIG_H
+
+/**************************************************************************
+ * This file is property of and copyright by the Experimental Nuclear     *
+ * Physics Group, Dep. of Physics                                         *
+ * University of Oslo, Norway, 2007                                       *
+ *                                                                        *
+ * Author: Per Thomas Hille <perthi@fys.uio.no> for the ALICE HLT Project.*
+ * Contributors are mentioned in the code where appropriate.              *
+ * Please report bugs to perthi@fys.uio.no                                *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+
+
+class  AliHLTPHOSConfig
+{
+public:
+  AliHLTPHOSConfig();
+  virtual ~AliHLTPHOSConfig();
+  void SetSoftwareBaselineSubtraction(bool isSoftwareBaselineSubtraction);
+  void PrintDefaultValues();
+
+protected:
+  bool fIsSoftwareBaselineSubtraction;
+};
+
+#endif

diff --git a/HLT/PHOS/AliHLTPHOSConstants.h b/HLT/PHOS/AliHLTPHOSConstants.h
index 516e7ad82d939c21d390c79da651720dba5a2efe..22539eb1d72c5726611a8fb364a161fbb842d7ee 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSConstants.h
+++ b/HLT/PHOS/AliHLTPHOSConstants.h
@@ -44,7 +44,7 @@ namespace PhosHLTConst
   const unsigned char PF_VECTOR_DIR[] = "/HLT/PHOS/PFVectors";
 #endif
 
-  const unsigned int PF_DEFAULT_N_SAMPLES = 70;
+    const unsigned int PF_DEFAULT_N_SAMPLES = 70;
   const unsigned int PF_DEFAULT_STARTINDEX = 0;
 
   const unsigned int DEFAULT_TAU = 2;    /**<Assume that the signal rise time of the altrp pulses is 2 us (nominal value of the electronics)*/

diff --git a/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx b/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx
index 2debfa5d400c7dee101766b662ac2dc3592cb003..0e56e94082753e1f7468c6082d26fa8ce49a41b4 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx
+++ b/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx
@@ -101,7 +101,7 @@ AliHLTPHOSRcuProcessor::ScanArguments(int argc, const char** argv)
     {
       Logging( kHLTLogFatal, "HLT::AliHLTPHOSRcuHistogramProducerComponent::DoInt( int argc, const char** argv )", "Missing argument",
               "The argument equippmentID is not set: set it with a component argumet like this: -equippmentID  <number>");
-      iResult = -2; 
+      iResult = -3; 
     }
   return iResult;
 }

diff --git a/HLT/PHOS/AliHLTPHOSValidCellDataStruct.h b/HLT/PHOS/AliHLTPHOSValidCellDataStruct.h
index 3353f2864d1834be1832b5d59044baf7677f9dce..626193ff51247589d1b6e9d1dee9ad4f9e87ea15 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSValidCellDataStruct.h
+++ b/HLT/PHOS/AliHLTPHOSValidCellDataStruct.h
@@ -1,5 +1,5 @@
-#ifndef ALIHLTPHOSVALIDCELLDATASTRUCT_H
-#define ALIHLTPHOSVALIDCELLDATASTRUCT_H 
+#ifndef ALIHLTPHOSVALIDCELLDEBUGDATASTRUCT_H
+#define ALIHLTPHOSVALIDCELLDEBUGDATASTRUCT_H 
 
 /***************************************************************************
  * Copyright(c) 2007, ALICE Experiment at CERN, All rights reserved.       *
@@ -19,6 +19,9 @@
 #include "AliHLTDataTypes.h"
 #include "Rtypes.h"
 
+//#define N_DATA_SAMPLES 70
+#define N_DATA_SAMPLES 510
+
 struct AliHLTPHOSValidCellDataStruct
 {
   AliHLTUInt8_t fZ;
@@ -26,6 +29,8 @@ struct AliHLTPHOSValidCellDataStruct
   AliHLTUInt8_t fGain;
   Float_t fEnergy;
   Float_t fTime;
+  Int_t fCrazyness;
+  Int_t fData[N_DATA_SAMPLES];
 };