- fixing compilation warnings

diff --git a/HLT/CALO/AliHLTCaloClusterizer.cxx b/HLT/CALO/AliHLTCaloClusterizer.cxx
index d1c8c3ebd2061a807fe24c1494953d8776cd43b0..a2bc5b269b35952a6a579efe28d6a68fbec46245 100644 (file)
--- a/HLT/CALO/AliHLTCaloClusterizer.cxx
+++ b/HLT/CALO/AliHLTCaloClusterizer.cxx
@@ -46,6 +46,7 @@ AliHLTCaloClusterizer::AliHLTCaloClusterizer(TString det):
   fEmcMinEnergyThreshold(0),\r
   fEmcTimeGate(0),\r
   fDigitsInCluster(0),\r
+  fDigitsPointerArray(0),\r
   fDigitContainerPtr(0),\r
   fMaxDigitIndexDiff(0),\r
   fNDigits(0)\r
@@ -99,7 +100,7 @@ AliHLTCaloClusterizer::ClusterizeEvent(Int_t nDigits, UInt_t availableSize, UInt
   UInt_t maxRecPointSize = sizeof(AliHLTCaloRecPointDataStruct) + (sizeof(AliHLTCaloDigitDataStruct) << 7); //Reasonable estimate... \r
 \r
   //Clusterization starts\r
-  for(UInt_t i = 0; i < nDigits; i++)\r
+  for(Int_t i = 0; i < nDigits; i++)\r
     { \r
       fDigitsInCluster = 0;\r
       //      printf("ENERGY: %f\n", fDigitsPointerArray[i]->fEnergy);\r

diff --git a/HLT/CALO/AliHLTCaloClusterizerComponent.cxx b/HLT/CALO/AliHLTCaloClusterizerComponent.cxx
index 278d151bfb64b795dd9e3836e267efb0ed42bdf3..2b68cc26e3727f0a6164802802a9c0c702acdfda 100644 (file)
--- a/HLT/CALO/AliHLTCaloClusterizerComponent.cxx
+++ b/HLT/CALO/AliHLTCaloClusterizerComponent.cxx
@@ -39,9 +39,9 @@
 
 
 AliHLTCaloClusterizerComponent::AliHLTCaloClusterizerComponent(TString det): 
-  AliHLTCaloConstantsHandler(det),
   AliHLTCaloProcessor(),
-  fDigitsPointerArray(0),
+  AliHLTCaloConstantsHandler(det),
+  fDigitsPointerArray(0), 
   fClusterizerPtr(0),
   fDigitCount(0)
 
@@ -121,7 +121,7 @@ AliHLTCaloClusterizerComponent::DoEvent(const AliHLTComponentEventData& evtData,
   Int_t nDigits           = 0;
   Int_t digCount          = 0;
 
-  UInt_t availableSize = size;
+  //UInt_t availableSize = size;
   AliHLTUInt8_t* outBPtr;
   outBPtr = outputPtr;
   const AliHLTComponentBlockData* iter = 0;

diff --git a/HLT/CALO/AliHLTCaloClusterizerComponent.h b/HLT/CALO/AliHLTCaloClusterizerComponent.h
index d52f5019164b1b45172d879a0a556a51d94b0d2f..af58ebd6be3f19394d89c14f8bfa3f442e40e771 100644 (file)
--- a/HLT/CALO/AliHLTCaloClusterizerComponent.h
+++ b/HLT/CALO/AliHLTCaloClusterizerComponent.h
@@ -185,6 +185,11 @@ class AliHLTCaloClusterizerComponent : public AliHLTCaloProcessor, public AliHLT
     /** Default constructor, not implemented */
     AliHLTCaloClusterizerComponent();                             //COMMENT
 
+    /** Copy constructor  not implemented */
+    AliHLTCaloClusterizerComponent ( const AliHLTCaloClusterizerComponent &); // not implemented
+    
+    /** Assignment */
+    AliHLTCaloClusterizerComponent & operator = ( const AliHLTCaloClusterizerComponent &); // not implemented
   };
 
 #endif

diff --git a/HLT/CALO/AliHLTCaloDigitMaker.cxx b/HLT/CALO/AliHLTCaloDigitMaker.cxx
index df3f42c19a1072dbeb270c72ad0b6db8824c0edd..46f5416b7144238b99952a7d9c846433f3a0438f 100644 (file)
--- a/HLT/CALO/AliHLTCaloDigitMaker.cxx
+++ b/HLT/CALO/AliHLTCaloDigitMaker.cxx
@@ -106,7 +106,6 @@ AliHLTCaloDigitMaker::MakeDigits(AliHLTCaloChannelDataHeaderStruct* channelDataH
   \r
   Reset();\r
 \r
-  Int_t j = 0;\r
   UInt_t totSize = sizeof(AliHLTCaloDigitDataStruct);\r
   \r
 //   Int_t xMod = -1;\r
@@ -117,8 +116,6 @@ AliHLTCaloDigitMaker::MakeDigits(AliHLTCaloChannelDataHeaderStruct* channelDataH
   \r
   \r
   AliHLTCaloChannelDataStruct* currentchannel = 0;\r
-  //  AliHLTCaloChannelDataStruct* currentchannelLG = 0;  \r
-  AliHLTCaloChannelDataStruct* tmpchannel = 0;\r
   \r
   fShmPtr->SetMemory(channelDataHeader);\r
   currentchannel = fShmPtr->NextChannel();\r

diff --git a/HLT/CALO/AliHLTCaloMapper.cxx b/HLT/CALO/AliHLTCaloMapper.cxx
index bce9bdd5a616291baf53d8ae75ee05ac805ea9b6..897a18ac0f596ea4bbeab7a0873b52b2aa65e2bd 100644 (file)
--- a/HLT/CALO/AliHLTCaloMapper.cxx
+++ b/HLT/CALO/AliHLTCaloMapper.cxx
@@ -36,8 +36,8 @@
 ClassImp(AliHLTCaloMapper);
 
 AliHLTCaloMapper::AliHLTCaloMapper( const unsigned long  specification , TString det) :  
-  AliHLTLogging(), 
   AliHLTCaloConstantsHandler(det),
+  AliHLTLogging(), 
   fHw2geomapPtr(0),
   fCellSize(0),
   fSpecification(specification),

diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx b/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx
index 40ce2a87d608b0f98abedd317ddf815c47429100..ce95f83b4fc0eaa12b8b045c1969bf86904ecd28 100644 (file)
--- a/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx
+++ b/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx
@@ -58,9 +58,9 @@ AliHLTCaloRawAnalyzerComponentv3::AliHLTCaloRawAnalyzerComponentv3(TString det):
   fBunchSizeCut(0),
   fMinPeakPosition(0),
   fMaxPeakPosition(100),
-  fRawDataWriter(0),
   fDoPushBadRawData(false),
-  fDoPushRawData(false)
+  fDoPushRawData(false),
+  fRawDataWriter(0)
 {
   //comment
 

diff --git a/HLT/EMCAL/AliHLTEMCALDefinitions.cxx b/HLT/EMCAL/AliHLTEMCALDefinitions.cxx
index 838241badc1297069cb8e55ab0b3ef58d40faebb..a85d773b8575b79998392db01340d8af513a0736 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALDefinitions.cxx
+++ b/HLT/EMCAL/AliHLTEMCALDefinitions.cxx
@@ -25,19 +25,26 @@
 
 ClassImp(AliHLTEMCALDefinitions)
 
-const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkDDLRawDataType = { sizeof(AliHLTComponentDataType), {'D','D','L','_','R','A','W',' '},{'E','M','C','A'}};;
+const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkDDLRawDataType = 
+AliHLTComponentDataTypeInitializer("DDL_RAW ", kAliHLTDataOriginEMCAL);
 
-const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkDigitDataType = { sizeof(AliHLTComponentDataType), {'D','I','G','I','T',' ',' ',' '},{'E','M','C','A'}};;
+const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkDigitDataType =
+AliHLTComponentDataTypeInitializer("DIGIT", kAliHLTDataOriginEMCAL);
 
-const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkClusterDataType = { sizeof(AliHLTComponentDataType), {'C','L','U','S','T','E','R','S'},{'E','M','C','A'}};;
+const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkClusterDataType =
+AliHLTComponentDataTypeInitializer("CLUSTERS", kAliHLTDataOriginEMCAL);
 
-const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkESDDataType = { sizeof(AliHLTComponentDataType), {'G','L','O','B','L','E','S','D'},{'E','M','C','A'}};;
+const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkESDDataType = 
+AliHLTComponentDataTypeInitializer("GLOBALESD", kAliHLTDataOriginEMCAL);
 
-const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkEMCALESDDataType = { sizeof(AliHLTComponentDataType), {'E','M','C','A','L','E','S','D'},{'E','M','C','A'}};;
+const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkEMCALESDDataType =
+AliHLTComponentDataTypeInitializer("EMCALESD", kAliHLTDataOriginEMCAL);
 
-const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkCalibrationDataType = { sizeof(AliHLTComponentDataType), {'C','A','L','I','B','R','A','H'},{'E','M','C','A'}};;
+const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkCalibrationDataType = 
+AliHLTComponentDataTypeInitializer("CALIBRAH", kAliHLTDataOriginEMCAL);
 
-const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkChannelDataType = { sizeof(AliHLTComponentDataType), {'C','H','A','N','N','E','L','T'},{'E','M','C','A'}};;
+const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkChannelDataType = 
+AliHLTComponentDataTypeInitializer("CHANNELT", kAliHLTDataOriginEMCAL);
 
 AliHLTEMCALDefinitions::AliHLTEMCALDefinitions()
 {

diff --git a/HLT/EMCAL/AliHLTEMCALMapper.cxx b/HLT/EMCAL/AliHLTEMCALMapper.cxx
index b764e19880bb9c934c008d8e6b9bf92ba98ea112..51681d5f10b7ca5adb4ff128c995534e2c76b57a 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALMapper.cxx
+++ b/HLT/EMCAL/AliHLTEMCALMapper.cxx
@@ -115,6 +115,8 @@ AliHLTEMCALMapper::InitAltroMapping(const unsigned long specification )
     {
       fIsInitializedMapping = false;
     }
+    
+    return fIsInitializedMapping;
 }
 
 

diff --git a/HLT/PHOS/AliHLTPHOSClusterizerComponent.h b/HLT/PHOS/AliHLTPHOSClusterizerComponent.h
index bde0f4b835369791e56859b3e4c114ea2388d750..2d2f591e2500b8d5627bb6ba0b54e1633fb295fc 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSClusterizerComponent.h
+++ b/HLT/PHOS/AliHLTPHOSClusterizerComponent.h
@@ -135,7 +135,7 @@ class AliHLTPHOSClusterizerComponent : public AliHLTCaloClusterizerComponent
   AliHLTComponent* Spawn();
 
 protected:
-  virtual int DoDeinit(){;}
+  virtual int DoDeinit(){ return 0;}
 
 private:
   

diff --git a/HLT/PHOS/AliHLTPHOSMapper.cxx b/HLT/PHOS/AliHLTPHOSMapper.cxx
index 3ba70bea78103ef377ba96fb0c3c95bb5468cea6..8681e5b416b9e002cf7ce2ef7477eca9dc636f72 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSMapper.cxx
+++ b/HLT/PHOS/AliHLTPHOSMapper.cxx
@@ -31,11 +31,12 @@
 
 AliHLTPHOSMapper::AliHLTPHOSMapper():  
    AliHLTCaloMapper(0,"PHOS") 
-   ,fDDLId(-1)
+   ,fIsInitializedMapping(false)
    ,fModuleId(-1)
+   ,fDDLId(-1)
 {
   InitDDLSpecificationMapping();
-  sprintf(fFilepath, "\0");
+  sprintf(fFilepath, "./");
 }