Replacing "is a" with a "has a" relationship

for several componets that "has" a RCU processor property
but wich "is not" a RCU property. In addition this componenet was needed
for the calibration processor since both the AliHLTPHOSRcuProcessor
and the AliHLTCalibrationProcessor inheriths from the
AliHLTProcessor, i.e ambigious inheritance that would have
been quite ugly to clean up.

diff --git a/HLT/PHOS/AliHLTPHOSRcuProperties.cxx b/HLT/PHOS/AliHLTPHOSRcuProperties.cxx
new file mode 100644 (file)
index 0000000..5f92c3a
--- /dev/null
+++ b/HLT/PHOS/AliHLTPHOSRcuProperties.cxx
@@ -0,0 +1,224 @@
+/**************************************************************************
+ * 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 "AliHLTPHOSRcuProperties.h"
+//#include "AliHLTPHOSConstants.h"
+
+
+//#include ""
+
+
+AliHLTPHOSRcuProperties::AliHLTPHOSRcuProperties() :fTest(-2),
+                                                   fkEquippmentID(0),
+                                                   fModID(2), 
+                                                   fRcuID(0),
+                                                   fRcuX(0), 
+                                                   fRcuZ(0),
+                                                   fRcuZOffset(0),
+                                                   fRcuXOffset(0),
+                                                   fPrintInfo(false),
+                                                   fPrintInfoFrequncy(10000),
+                                                   fIsSetEquippmentID(kFALSE),
+                                                   fLog(),
+                                                   fIsInitialized(false)
+{
+
+}
+
+AliHLTPHOSRcuProperties::~AliHLTPHOSRcuProperties()
+{
+
+}
+
+
+const AliHLTUInt16_t
+AliHLTPHOSRcuProperties::GetEquippmentID() const
+{
+  return fkEquippmentID;
+}
+
+
+const int 
+AliHLTPHOSRcuProperties::GetRCUID() const
+{
+  cout << "AliHLTPHOSRcuProperties::GetRCUI returning " <<  fRcuID  << endl;
+  if(fIsInitialized == true)
+    {
+      cout <<"AliHLTPHOSRcuProperties::GetRCUID fIsInitialized = TRUE"  << endl;
+    }
+  else
+    {
+      cout <<"AliHLTPHOSRcuProperties::GetRCUID fIsInitialized = FALSE"  << endl;
+    }
+
+ return fRcuID;
+  // cout << "AliHLTPHOSRcuProperties::GetRCUI returning " <<  fRcuID  << endl;
+
+  // int tmpRcuId = 0;
+
+
+  /*
+  if(fRcuZ ==0 && fRcuX == 0)
+    {
+      tmpRcuId = 0; 
+    }
+
+  if(fRcuZ ==1 && fRcuX == 0)
+    {
+      tmpRcuId = 1; 
+    }
+  
+  if(fRcuZ ==1 && fRcuX == 1)
+    {
+      tmpRcuId = 2; 
+    }
+
+    if(fRcuZ ==0 && fRcuX == 1)
+    {
+      tmpRcuId = 3; 
+    }
+  */   
+
+  //  return tmpRcuId;
+}
+
+
+
+void 
+AliHLTPHOSRcuProperties::SetEquippmentID(AliHLTUInt16_t id)
+{
+  AliHLTUInt16_t  &ref = const_cast<AliHLTUInt16_t&>(fkEquippmentID); 
+  ref = id;
+}
+
+
+int
+AliHLTPHOSRcuProperties::ScanArguments(int argc, const char** argv)
+{
+  fPrintInfo = kFALSE;
+  int iResult=0;
+  TString argument="";
+
+  for(int i=0; i<argc && iResult>=0; i++) 
+    {
+      argument=argv[i];
+      
+    
+      if (argument.IsNull()) 
+       {
+         continue;
+       }
+                        
+    if (argument.CompareTo("-equipmentID") == 0) 
+       {
+         cout << "AliHLTPHOSRcuProperties:ScanArguments  argument = -equipmentID   "  <<endl;  
+         if(i+1 <= argc)
+           {
+             SetEquippmentID((AliHLTUInt16_t)atoi(argv[i+1]));
+             cout <<"AliHLTPHOSRcuProperties:ScanArguments  equipmentID =  " << fkEquippmentID  <<endl;
+             fLog.Logging(kHLTLogInfo, __FILE__ , "Init info", "  setting equippment ID to  %lu ", fkEquippmentID); 
+             SetCoordinates(fkEquippmentID);
+             fIsSetEquippmentID = kTRUE;
+           }
+         else
+           {
+              iResult= -1;
+              fLog.Logging( kHLTLogFatal, "HLT::AliHLTPHOSRcuProperties::ScanArguments( int argc, const char** argv )", "Missing argument",
+                       "The argument -equippmentID expects a number");
+              return  iResult;   
+           }
+       }
+    
+    
+    if (argument.CompareTo("-printinfo") == 0) 
+      {
+       if(i+1 <= argc)
+         {
+           argument=argv[i+1];
+           fPrintInfoFrequncy = atoi(argv[i+1]);
+           fPrintInfo = kTRUE;
+           fLog.Logging(kHLTLogInfo, __FILE__ , "Info output", " setting printinfo = kTRUE, with update frequency every %lu th event ", fPrintInfoFrequncy);
+         }
+       else
+         {
+           //      cout << "WARNING: asking for event info, but no update frequency is specified, option is ignored" << endl;
+           fLog.Logging(kHLTLogWarning, __FILE__ , "Invalid request", " asking for event info, but no update frequency is specified, request  ignored");
+         }
+      }
+ 
+    }
+
+
+  if(fIsSetEquippmentID == kFALSE)
+    {
+      fLog.Logging( kHLTLogFatal, "HLT::AliHLTPHOSRcuProperties::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 = -3; 
+    }
+  return iResult;
+}
+
+
+void 
+AliHLTPHOSRcuProperties::SetCoordinates(AliHLTUInt16_t /*equippmentID*/)
+{
+  // int rcuIndex =  (fkEquippmentID - 1792)%N_RCUS_PER_MODULE;
+
+  fRcuID =  (fkEquippmentID - 1792)%N_RCUS_PER_MODULE;
+  //  fModID = (fkEquippmentID  -1792 -rcuIndex)/N_RCUS_PER_MODULE;
+  fModID = (fkEquippmentID  -1792 - fRcuID)/N_RCUS_PER_MODULE;
+ 
+  if( fRcuID  == 0)
+    {
+      fRcuX = 0; 
+      fRcuZ = 0;
+    }
+
+  if( fRcuID  == 1)
+    {
+      fRcuX = 0; 
+      fRcuZ = 1;
+    }
+ 
+  if( fRcuID == 2)
+    {
+      fRcuX = 1; 
+      fRcuZ = 0;
+    }
+
+  if( fRcuID == 3)
+    {
+      fRcuX = 1; 
+      fRcuZ = 1;
+    }
+
+  fRcuZOffset =  N_ZROWS_RCU*fRcuZ;
+  fRcuXOffset =  N_XCOLUMNS_RCU*fRcuX;
+  
+  // cout <<"********InitInfo************"<< endl;
+//   cout <<"AliHLTPHOSRcuProperties::SetCoordinate casted"<< endl;
+//   cout <<"rcuIndex"<< fRcuID  <<endl;
+//   cout <<"Equpippment ID =\t"<< fkEquippmentID <<endl;
+//   cout <<"Mod ID =\t"<<  (int)fModID<<endl;
+//   cout <<"RCUX =\t\t" << (int)fRcuX << endl;
+//   cout <<"RCUZ =\t\t" << (int)fRcuZ << endl;
+//   cout <<"RcuZOffset = \t" <<  (int)fRcuZOffset << endl;
+//   cout <<"RcuXOffset = \t" <<  (int)fRcuXOffset << endl << endl;
+  fIsInitialized = true;
+}
+

diff --git a/HLT/PHOS/AliHLTPHOSRcuProperties.h b/HLT/PHOS/AliHLTPHOSRcuProperties.h
new file mode 100644 (file)
index 0000000..ba3cada
--- /dev/null
+++ b/HLT/PHOS/AliHLTPHOSRcuProperties.h
@@ -0,0 +1,64 @@
+#ifndef ALIHLTPHOSRCUPROPERTIES_HPP
+#define ALIHLTPHOSRCUPROPERTIES_HPP
+
+/**************************************************************************
+ * 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 "AliHLTDataTypes.h"
+#include "AliHLTLogging.h"
+#include "AliHLTPHOSConstants.h"
+
+using namespace PhosHLTConst;
+
+//class  AliHLTPHOSRcuProperties : public AliHLTLogging
+class  AliHLTPHOSRcuProperties
+{
+public:
+  AliHLTPHOSRcuProperties();
+  virtual ~AliHLTPHOSRcuProperties();
+
+  const AliHLTUInt16_t  GetEquippmentID() const;
+  const int GetRCUID() const;
+  virtual int ScanArguments(int argc, const char** argv);
+  void SetEquippmentID(AliHLTUInt16_t id);
+  void SetCoordinates(AliHLTUInt16_t equippmentID);
+
+  
+  int fTest;
+
+ protected:
+  const AliHLTUInt16_t fkEquippmentID;  /**<Equippment ID as defined by ALICE*/
+  AliHLTUInt8_t  fModID; /**<ID of the module this component read data from (0-4)*/
+  int fRcuID;
+  AliHLTUInt8_t  fRcuX;                 /**<X position of RCU the data from this Equippment comes from (0 or 1)*/
+  AliHLTUInt8_t  fRcuZ;                 /**<Z position of RCU the data from this Equippment comes from (0 or 1)*/
+  AliHLTUInt8_t  fRcuZOffset;           /**<offset in therms of towers in the Z direction relative to the module*/ 
+  AliHLTUInt8_t  fRcuXOffset;           /**<offset in therms of towers in the X direction relative to the module*/
+  Bool_t fPrintInfo;                    /**<wether or not to print debugg info to std out*/
+  int fPrintInfoFrequncy;               /**<Defines the update frequency for information printet to std out*/
+
+  Bool_t fIsSetEquippmentID;            /**<wether or not the EquippmentID is set*/
+  AliHLTLogging fLog;
+
+  bool fIsInitialized; 
+ 
+  
+
+};
+
+#endif