compilation warnings fixed
authorsgorbuno <sgorbuno@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 14 Nov 2010 20:00:26 +0000 (20:00 +0000)
committersgorbuno <sgorbuno@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sun, 14 Nov 2010 20:00:26 +0000 (20:00 +0000)
HLT/BASE/AliHLTTTreeProcessor.cxx
HLT/BASE/util/AliHLTRootSchemaEvolutionComponent.cxx
HLT/CALO/AliHLTCaloClusterizer.cxx
HLT/EVE/AliHLTEveHistoMerger.cxx
HLT/EVE/AliHLTEveMultCorr.cxx
HLT/JET/cone/AliHLTJETConeJetCandidate.cxx
HLT/PHOS/AliHLTPHOSClusterizerComponentNbyN.cxx
HLT/QA/AliHLTTPCQADataMaker.cxx
HLT/TPCLib/AliHLTTPCCFComparisonComponent.cxx
HLT/TPCLib/AliHLTTPCMemHandler.cxx
HLT/TPCLib/calibration/AliHLTTPCCalibTimeComponent.cxx

index d8bd54f..e85f6f9 100644 (file)
@@ -198,12 +198,12 @@ int AliHLTTTreeProcessor::DoEvent(const AliHLTComponentEventData& evtData, AliHL
   bool bDoPublishing=false;
   const int cycleResetInterval=1000;
   if (fpEventTimer && fpCycleTimer) {
-    averageEventTime=(fpEventTimer->RealTime()*fgkTimeScale)/(GetEventCount()+1);
-    fillingtime=fpEventTimer->RealTime()*fgkTimeScale;
+    averageEventTime=(AliHLTUInt32_t)( (fpEventTimer->RealTime()*fgkTimeScale)/(GetEventCount()+1) );
+    fillingtime=(int)( fpEventTimer->RealTime()*fgkTimeScale );
     publishtime=fillingtime;
     fpEventTimer->Start(kFALSE);
     fpCycleTimer->Stop();
-    averageCycleTime=(fpCycleTimer->RealTime()*fgkTimeScale)/((GetEventCount()%cycleResetInterval)+1);
+    averageCycleTime=(AliHLTUInt32_t)( (fpCycleTimer->RealTime()*fgkTimeScale)/((GetEventCount()%cycleResetInterval)+1) );
     // adapt processing to 3/4 of the max time
     bDoFilling=4*averageEventTime<3*fMaxEventTime ||
       (averageEventTime<fCycleTimeFactor*averageCycleTime && fpCycleTimer->RealTime()>fIgnoreCycleTime);
@@ -228,7 +228,7 @@ int AliHLTTTreeProcessor::DoEvent(const AliHLTComponentEventData& evtData, AliHL
   }
   if (fpEventTimer) {
     fpEventTimer->Stop();
-    fillingtime=fpEventTimer->RealTime()*fgkTimeScale-fillingtime;
+    fillingtime=(int) ( fpEventTimer->RealTime()*fgkTimeScale-fillingtime );
     if (fillingtime<0) fillingtime=0;
     fpEventTimer->Start(kFALSE);
   }
@@ -271,11 +271,11 @@ int AliHLTTTreeProcessor::DoEvent(const AliHLTComponentEventData& evtData, AliHL
 
   if (fpEventTimer) {
     fpEventTimer->Stop();
-    publishtime=fpEventTimer->RealTime()*fgkTimeScale-publishtime;
+    publishtime=(int) ( fpEventTimer->RealTime()*fgkTimeScale-publishtime );
     if (publishtime>fillingtime) publishtime-=fillingtime;
     else publishtime=0;
 
-    averageEventTime=(fpEventTimer->RealTime()*fgkTimeScale)/(GetEventCount()+1);
+    averageEventTime=(AliHLTUInt32_t)( (fpEventTimer->RealTime()*fgkTimeScale)/(GetEventCount()+1) );
 
     // info output once every 5 seconds
     static UInt_t lastTime=0;
index 1903f41..d4189a8 100644 (file)
@@ -186,13 +186,13 @@ int AliHLTRootSchemaEvolutionComponent::ProcessCalibration( const AliHLTComponen
 
   AliHLTUInt32_t proctime=0;
   if (fpEventTimer) {
-    averageEventTime=(fpEventTimer->RealTime()*fgkTimeScale)/(GetEventCount()+1);
-    proctime=fpEventTimer->RealTime()*fgkTimeScale;
+    averageEventTime=(AliHLTUInt32_t)( (fpEventTimer->RealTime()*fgkTimeScale)/(GetEventCount()+1) );
+    proctime=(AliHLTUInt32_t)( fpEventTimer->RealTime()*fgkTimeScale );
     fpEventTimer->Start(kFALSE);
   }
   if (fpCycleTimer) {
     fpCycleTimer->Stop();
-    averageCycleTime=(fpCycleTimer->RealTime()*fgkTimeScale)/(GetEventCount()+1);
+    averageCycleTime=(AliHLTUInt32_t)( (fpCycleTimer->RealTime()*fgkTimeScale)/(GetEventCount()+1) );
   }
 
   // scale down the event processing according to the required rate
@@ -233,8 +233,8 @@ int AliHLTRootSchemaEvolutionComponent::ProcessCalibration( const AliHLTComponen
 
   if (fpEventTimer) {
     fpEventTimer->Stop();
-    proctime=fpEventTimer->RealTime()*fgkTimeScale-proctime;
-    averageEventTime=(fpEventTimer->RealTime()*fgkTimeScale)/(GetEventCount()+1);
+    proctime=(AliHLTUInt32_t)( fpEventTimer->RealTime()*fgkTimeScale-proctime );
+    averageEventTime=(AliHLTUInt32_t)( (fpEventTimer->RealTime()*fgkTimeScale)/(GetEventCount()+1) );
 
     // info output once every 2 seconds
     static UInt_t lastTime=0;
@@ -567,7 +567,7 @@ TObject* AliHLTRootSchemaEvolutionComponent::AliHLTDataBlockItem::Extract(const
   TObject* pObj=msg.ReadObject(objclass);
   if (!(fIsObject=(pObj!=NULL))) return NULL;
   sw.Stop();
-  AliHLTUInt32_t usec=sw.RealTime()*fgkTimeScale;
+  AliHLTUInt32_t usec=(AliHLTUInt32_t)( sw.RealTime()*fgkTimeScale );
   fNofExtractions++;
   fExtractionTimeUsec+=usec;
   TTimeStamp ts;
@@ -583,7 +583,7 @@ int AliHLTRootSchemaEvolutionComponent::AliHLTDataBlockItem::Stream(TObject* obj
   sw.Start();
   msg.WriteObject(obj);
 
-  AliHLTUInt32_t usec=sw.RealTime()*fgkTimeScale;
+  AliHLTUInt32_t usec=(AliHLTUInt32_t)( sw.RealTime()*fgkTimeScale );
   fNofStreamings++;
   fStreamingTimeUsec+=usec;
   TTimeStamp ts;
index e354633..c757899 100644 (file)
@@ -322,5 +322,5 @@ Int_t
 AliHLTCaloClusterizer::CompareDigitsByEnergy(const void *dig0, const void *dig1)\r
 {\r
     // See header file for documentation\r
-    return (*((AliHLTCaloDigitDataStruct**)(dig1)))->fEnergy - (*((AliHLTCaloDigitDataStruct**)(dig0)))->fEnergy;\r
+    return (Int_t)( (*((AliHLTCaloDigitDataStruct**)(dig1)))->fEnergy - (*((AliHLTCaloDigitDataStruct**)(dig0)))->fEnergy );\r
 }\r
index aa265bc..d4bbc7f 100644 (file)
@@ -130,8 +130,8 @@ TObject* AliHLTEveHistoMerger::Process(const TObject * evtData, AliHLTUInt32_t s
 
 // merge histos
 
-    for ( unsigned int iColl = 0; iColl<fStore.size(); iColl++) {
-        AliHLTGlobalHCCollection &c = fStore[iColl];
+    for ( unsigned int jColl = 0; jColl<fStore.size(); jColl++) {
+        AliHLTGlobalHCCollection &c = fStore[jColl];
         if ( !c.fNeedToMerge && c.fMergedObject ) continue;
         if ( c.fInstances.size() <1 ) continue;
         delete c.fMergedObject;
index a118229..f3fee28 100644 (file)
@@ -247,7 +247,7 @@ void AliHLTEveMultCorr::AddHistogramToCanvas(TH1* hist, TCanvas* canvas, Int_t&
            if(zoom) 
            {
              TH1F *h = dynamic_cast<TH1F*>(hist);
-             h->GetXaxis()->SetRange(0, h->GetMaximumBin() + h->GetMaximumBin()*0.2);
+             h->GetXaxis()->SetRange(0, (Int_t)(h->GetMaximumBin() + h->GetMaximumBin()*0.2));
            }
             dynamic_cast<TH1F*>(hist)->Draw();
         }
@@ -257,8 +257,8 @@ void AliHLTEveMultCorr::AddHistogramToCanvas(TH1* hist, TCanvas* canvas, Int_t&
            if(zoom)
            {
              TH2F *h = dynamic_cast<TH2F*>(hist);
-             h->GetXaxis()->SetRange(0, h->GetMaximumBin() + h->GetMaximumBin()*0.2);
-             h->GetYaxis()->SetRange(0, h->GetMaximumBin() + h->GetMaximumBin()*0.2);
+             h->GetXaxis()->SetRange(0, (Int_t)(h->GetMaximumBin() + h->GetMaximumBin()*0.2));
+             h->GetYaxis()->SetRange(0, (Int_t)(h->GetMaximumBin() + h->GetMaximumBin()*0.2));
            }
             dynamic_cast<TH2F*>(hist)->Draw("COLZ");
         }
index a722aba..e90a750 100644 (file)
@@ -46,9 +46,9 @@ ClassImp(AliHLTJETConeJetCandidate)
 
 //##################################################################################
   AliHLTJETConeJetCandidate::AliHLTJETConeJetCandidate() :
-    fSeedCellIdx(0.),
-    fSeedEtaIdx(0.),
-    fSeedPhiIdx(0.),
+    fSeedCellIdx(0),
+    fSeedEtaIdx(0),
+    fSeedPhiIdx(0),
     fSeedEta(0.),
     fSeedPhi(0.),
     fSeedPt(0.),
index dcfc216..e140f98 100644 (file)
@@ -61,7 +61,7 @@ int AliHLTPHOSClusterizerComponentNbyN::ScanConfigurationArgument(int argc, cons
     {
         if (++i >= argc) return -EPROTO;
         argument = argv[i];
-        dynamic_cast<AliHLTCaloClusterizerNbyN*>(fClusterizerPtr)->SetGridDimension(argument.Atof());
+        dynamic_cast<AliHLTCaloClusterizerNbyN*>(fClusterizerPtr)->SetGridDimension(argument.Atoi());
         return 1;
     }
     
index 9385d3e..6ff27aa 100644 (file)
@@ -301,9 +301,9 @@ void AliHLTTPCQADataMaker::MakeESDs(AliESDEvent * esd, AliESDEvent* hltesd)
   } 
   
   if(nESDTracks)
-    nClsOffline /= Float_t(nESDTracks);
+    nClsOffline = (Int_t)( Float_t(nClsOffline)/Float_t(nESDTracks) );
   if(nHLTesdTracks)
-    nClsHLT /= Float_t(nHLTesdTracks);
+    nClsHLT = (Int_t)( Float_t(nClsHLT)/ Float_t(nHLTesdTracks) );
 
   GetESDsData(kNCls)->Fill(nClsOffline, nClsHLT);
 
index 55e6324..bca8191 100644 (file)
@@ -382,7 +382,7 @@ int AliHLTTPCCFComparisonComponent::ScanConfigurationArgument(int argc, const ch
   if (argument.CompareTo("-event-modulo")==0) {
     if (++i>=argc) return -EPROTO;
     argument=argv[i];
-    fEvtMod=argument.Atof();
+    fEvtMod=argument.Atoi();
     return 2;
   }    
 
@@ -390,7 +390,7 @@ int AliHLTTPCCFComparisonComponent::ScanConfigurationArgument(int argc, const ch
   if (argument.CompareTo("-buffer-size")==0) {
     if (++i>=argc) return -EPROTO;
     argument=argv[i];
-    fBufferSize=argument.Atof();
+    fBufferSize=argument.Atoi();
     return 2;
   }    
    
index 674f3f0..f1158a8 100644 (file)
@@ -1206,10 +1206,10 @@ void AliHLTTPCMemHandler::UpdateRowPointer(AliHLTTPCDigitRowData *&tempPt)
 {
   //Update the data pointer to the next padrow in memory.
   
-  Byte_t *tmp = (Byte_t*)tempPt;
+  Byte_t *tmp = reinterpret_cast<Byte_t*>(tempPt);
   Int_t size = sizeof(AliHLTTPCDigitRowData) + tempPt->fNDigit*sizeof(AliHLTTPCDigitData);
   tmp += size;
-  tempPt = (AliHLTTPCDigitRowData*)tmp;
+  tempPt = reinterpret_cast<AliHLTTPCDigitRowData*>(tmp);
 }
 
 Int_t  AliHLTTPCMemHandler::ComparePoints(UInt_t /*row*/,UShort_t pad,UShort_t time) const
index 537f0c9..e13c1b0 100644 (file)
@@ -145,7 +145,7 @@ Int_t AliHLTTPCCalibTimeComponent::ScanConfigurationArgument( Int_t argc, const
   if (argument.CompareTo("-output-size")==0) {
     if (++i>=argc) return -EPROTO;
     argument=argv[i];
-    fOutputSize=argument.Atof();
+    fOutputSize=(AliHLTUInt32_t)argument.Atoi();
     return 2;
   }
   return -EINVAL;