1) Cosmetics, pluss 2) first iteration in phasing out

[u/mrichter/AliRoot.git] / HLT / PHOS / AliHLTPHOSRcuProcessor.cxx

diff --git a/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx b/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx
index 3fd1aa7a4294eff67238d8ec95ccb791d2cce1e1..939c4d311b828dd34c5aeba4ab2c29e1184b0363 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx
+++ b/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx
@@ -18,12 +18,13 @@
 #include "AliHLTPHOSRcuProcessor.h"
 
 AliHLTPHOSRcuProcessor::AliHLTPHOSRcuProcessor():AliHLTPHOSProcessor(), 
-                                                fkEquippmentID(0),
-                                                fRcuX(0), 
-                                                fRcuZ(0),
-                                                fRcuZOffset(0),
-                                                fRcuXOffset(0),
-                                                fIsSetEquippmentID(kFALSE)    
+                                                AliHLTPHOSRcuProperties()
+                       //                       fkEquippmentID(0),
+//                                              fRcuX(0), 
+//                                              fRcuZ(0),
+//                                              fRcuZOffset(0),
+//                                              fRcuXOffset(0),
+//                                              fIsSetEquippmentID(kFALSE)    
 {
   //  cout << "AliHLTPHOSRcuProcessor::AliHLTPHOSRcuProcessor() "<< endl;
 }
@@ -34,89 +35,33 @@ AliHLTPHOSRcuProcessor::~AliHLTPHOSRcuProcessor()
 }
 
 
+/*
 const AliHLTUInt16_t
 AliHLTPHOSRcuProcessor::GetEquippmentID() const
 {
   return fkEquippmentID;
 }
+*/
 
+
+ /*
 void 
 AliHLTPHOSRcuProcessor::SetEquippmentID(AliHLTUInt16_t id)
 {
   AliHLTUInt16_t  &ref = const_cast<AliHLTUInt16_t&>(fkEquippmentID); 
   ref = id;
 }
+*/
 
 
-int
-AliHLTPHOSRcuProcessor::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 << "AliHLTPHOSProcessor:DoInit  argument = -equipmentID   "  <<endl;  
-         if(i+1 <= argc)
-           {
-             SetEquippmentID((AliHLTUInt16_t)atoi(argv[i+1]));
-             Logging(kHLTLogInfo, __FILE__ , "Init info", "  setting equippment ID to  %lu ", fkEquippmentID); 
-             SetCoordinates(fkEquippmentID);
-             fIsSetEquippmentID = kTRUE;
-           }
-         else
-           {
-              iResult= -1;
-              Logging( kHLTLogFatal, "HLT::AliHLTPHOSRcuHistogramProducerComponent::DoInt( 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;
-           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;
-           Logging(kHLTLogWarning, __FILE__ , "Invalid request", " asking for event info, but no update frequency is specified, request  ignored");
-         }
-      }
  
-    }
-
-
-  if(fIsSetEquippmentID == kFALSE)
-    {
-      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 = -3; 
-    }
-  return iResult;
-}
-
-void 
-AliHLTPHOSRcuProcessor::SetCoordinates(AliHLTUInt16_t /*equippmentID*/)
+  //void 
+  //AliHLTPHOSRcuProcessor::SetCoordinates(AliHLTUInt16_t /*equippmentID*/)
+/*
 {
   int rcuIndex =  (fkEquippmentID - 1792)%N_RCUS_PER_MODULE;
-  fModuleID = (fkEquippmentID  -1792 -rcuIndex)/N_RCUS_PER_MODULE;
+  fModID = (fkEquippmentID  -1792 -rcuIndex)/N_RCUS_PER_MODULE;
   
   if(rcuIndex == 0)
     {
@@ -145,13 +90,17 @@ AliHLTPHOSRcuProcessor::SetCoordinates(AliHLTUInt16_t /*equippmentID*/)
   fRcuZOffset =  N_ZROWS_RCU*fRcuZ;
   fRcuXOffset =  N_XCOLUMNS_RCU*fRcuX;
 
+*/
+
 //   cout <<"********InitInfo************"<< endl;
 //   cout <<"AliHLTPHOSRawAnalyzerComponent::SetCoordinate casted"<< endl;
 //   cout <<"Equpippment ID =\t"<< fkEquippmentID <<endl;
-//   cout <<"Module ID =\t"<<  (int)fModuleID<<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;
 
-}
+//}
+
+