correcting compilation warning and making change of AliShuttleInterface (rev 29388)

backward compatible

diff --git a/HLT/BASE/AliHLTComponent.cxx b/HLT/BASE/AliHLTComponent.cxx
index 0f8871de59b818a47fa007eddda382fa97c53797..e5548d83874254d12041d37eb7c91a968cd19bb3 100644 (file)
--- a/HLT/BASE/AliHLTComponent.cxx
+++ b/HLT/BASE/AliHLTComponent.cxx
@@ -749,6 +749,15 @@ int AliHLTComponent::GetNumberOfInputBlocks() const
   return 0;
 }
 
+AliHLTEventID_t AliHLTComponent::GetEventId() const
+{
+  // see header file for function documentation
+  if (fpInputBlocks!=NULL) {
+    return fCurrentEventData.fEventID;
+  }
+  return 0;
+}
+
 const TObject* AliHLTComponent::GetFirstInputObject(const AliHLTComponentDataType& dt,
                                                    const char* classname,
                                                    int bForce)
@@ -1632,6 +1641,7 @@ int AliHLTComponent::ProcessEvent( const AliHLTComponentEventData& evtData,
     // no output blocks, set size to 0
     size=0;
   }
+  FillEventData(fCurrentEventData);
   return iResult;
 }
 

diff --git a/HLT/BASE/AliHLTComponent.h b/HLT/BASE/AliHLTComponent.h
index 636528c895ffffa5546610b066b9d7a52247cd1e..deb05aff550a8e10fdbbb3a28064644a4b2a2341 100644 (file)
--- a/HLT/BASE/AliHLTComponent.h
+++ b/HLT/BASE/AliHLTComponent.h
@@ -844,6 +844,12 @@ class AliHLTComponent : public AliHLTLogging {
    */
   int GetNumberOfInputBlocks() const;
 
+  /**
+   * Get id of the current event
+   * @return event id
+   */
+  AliHLTEventID_t GetEventId() const;
+
   /**
    * Get the first object of a specific data type from the input data.
    * The hight-level methods provide functionality to transfer ROOT data

diff --git a/HLT/BASE/AliHLTTask.h b/HLT/BASE/AliHLTTask.h
index 799f4901c624c5be429154454c4ae56b5642bed2..689bbdeeed993a3cbe97d716273b07c73f66abc6 100644 (file)
--- a/HLT/BASE/AliHLTTask.h
+++ b/HLT/BASE/AliHLTTask.h
@@ -81,6 +81,7 @@ class AliHLTTask : public TObject, public AliHLTLogging {
    * Create the component.
    * @param pConf    configuration descritption
    * @param pCH      component handler
+   * @param pComponent [OUT] target to get the component instance
    * @return component instance
    */
   virtual int CreateComponent(AliHLTConfiguration* pConf, AliHLTComponentHandler* pCH, AliHLTComponent*& pComponent) const;

diff --git a/HLT/BASE/interface/AliHLTExternalInterface.h b/HLT/BASE/interface/AliHLTExternalInterface.h
index ceb9392e9632be210e69e38b9ff84fba20accc31..8cb195b764799c5a8d77d833150264b5f4067f11 100644 (file)
--- a/HLT/BASE/interface/AliHLTExternalInterface.h
+++ b/HLT/BASE/interface/AliHLTExternalInterface.h
@@ -124,7 +124,7 @@ extern "C" {
    * @return pointer to system call
    * @ingroup alihlt_wrapper_interface
    */
-  void* AliHLTAnalysisGetInterfaceCall(const char*);
+  void* AliHLTAnalysisGetInterfaceCall(const char* function);
 
 #ifdef __cplusplus
 }

diff --git a/HLT/BASE/util/AliHLTESDMCEventPublisherComponent.cxx b/HLT/BASE/util/AliHLTESDMCEventPublisherComponent.cxx
index 7cecdc0d072185d2c9639eb8931534501b3819d5..ab5d07d93092a5e6d3bfbbf8ec826324c9a751c5 100644 (file)
--- a/HLT/BASE/util/AliHLTESDMCEventPublisherComponent.cxx
+++ b/HLT/BASE/util/AliHLTESDMCEventPublisherComponent.cxx
@@ -108,7 +108,7 @@ AliHLTComponent* AliHLTESDMCEventPublisherComponent::Spawn() {
  */
 
 // #################################################################################
-Int_t AliHLTESDMCEventPublisherComponent::DoInit(Int_t argc, const char** argv) {
+Int_t AliHLTESDMCEventPublisherComponent::DoInit(int argc, const char** argv) {
   // see header file for class documentation
 
   Int_t iResult = 0;

diff --git a/HLT/BASE/util/AliHLTESDMCEventPublisherComponent.h b/HLT/BASE/util/AliHLTESDMCEventPublisherComponent.h
index 169d318d4def31f5d34a097658b2178d828ac449..caafff4c71d0c506ca0acb9bc2a82d3816a3fd70 100644 (file)
--- a/HLT/BASE/util/AliHLTESDMCEventPublisherComponent.h
+++ b/HLT/BASE/util/AliHLTESDMCEventPublisherComponent.h
@@ -136,7 +136,7 @@ class AliHLTESDMCEventPublisherComponent : public AliHLTFilePublisher  {
    *         -EINVAL unknown argument <br>
    *         -EPROTO parameter for argument missing <br>
    */
-  Int_t DoInit( Int_t argc, const Char_t** argv );
+  Int_t DoInit( int argc, const char** argv );
 
 
   /**

diff --git a/HLT/EMCAL/AliHLTEMCALTrackerComponent.cxx b/HLT/EMCAL/AliHLTEMCALTrackerComponent.cxx
index 5699cec9ac8cd333bc847b710d336cbc486233c0..38518fec5ac8e608d5bc167de027492c441f2307 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALTrackerComponent.cxx
+++ b/HLT/EMCAL/AliHLTEMCALTrackerComponent.cxx
@@ -228,8 +228,8 @@ int AliHLTEMCALTrackerComponent::DoDeinit()
   return 0;
 }
 
-int AliHLTEMCALTrackerComponent::DoEvent( const AliHLTComponentEventData & evtData,
-                                       AliHLTComponentTriggerData & trigData )
+int AliHLTEMCALTrackerComponent::DoEvent( const AliHLTComponentEventData & /*evtData*/,
+                                         AliHLTComponentTriggerData & /*trigData*/ )
 {
   //
   // see header file for class documentation
@@ -237,13 +237,13 @@ int AliHLTEMCALTrackerComponent::DoEvent( const AliHLTComponentEventData & evtDa
 
   // check if the input data are there at all - empty events possible
   
-  HLTDebug("HLT::TRDTracker::DoEvent", "BLOCKS", "NofBlocks %lu", evtData.fBlockCnt );
+  HLTDebug("HLT::TRDTracker::DoEvent", "BLOCKS", "NofBlocks %lu", GetNumberOfInputBlocks() );
 
   //implement a usage of the following
   //   AliHLTUInt32_t triggerDataStructSize = trigData.fStructSize;
   //   AliHLTUInt32_t triggerDataSize = trigData.fDataSize;
   //   void *triggerData = trigData.fData;
-  HLTDebug("Struct size %d Data size %d Data location 0x%x", trigData.fStructSize, trigData.fDataSize, (UInt_t*)trigData.fData);
+  //HLTDebug("Struct size %d Data size %d Data location 0x%x", trigData.fStructSize, trigData.fDataSize, (UInt_t*)trigData.fData);
 
   //   another way to check the blocks
   //   AliHLTComponentBlockData *dblock = (AliHLTComponentBlockData *)GetFirstInputBlock( AliHLTEMCALDefinitions::fgkClusterDataType );

diff --git a/HLT/TPCLib/AliHLTTPCCalibTracksComponent.cxx b/HLT/TPCLib/AliHLTTPCCalibTracksComponent.cxx
index e1f6d1e540562e94a18486f16d8447819d0c7bde..c4249d9abe735d0ebb884b86c504aec4c5d38eda 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCCalibTracksComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCCalibTracksComponent.cxx
@@ -434,9 +434,9 @@ Int_t AliHLTTPCCalibTracksComponent::ShipDataToFXS(const AliHLTComponentEventDat
 
 void AliHLTTPCCalibTracksComponent::ReadTracks(const AliHLTComponentBlockData *iter, Int_t &tt){
 
-  AliHLTUInt8_t slice = AliHLTTPCDefinitions::GetMinSliceNr( *iter );
-  AliHLTUInt8_t patch = AliHLTTPCDefinitions::GetMinPatchNr( *iter );  
-  HLTDebug("Input Data - TPC cluster - Slice/Patch: %d/%d.", slice, patch);
+  HLTDebug("Input Data - TPC cluster - Slice/Patch: %d/%d.", 
+          AliHLTTPCDefinitions::GetMinSliceNr( *iter ), 
+          AliHLTTPCDefinitions::GetMinPatchNr( *iter ));
  
 
   const AliHLTTPCTrackletData *trackData = (const AliHLTTPCTrackletData*)iter->fPtr;

diff --git a/HLT/TPCLib/AliHLTTPCClusterDumpComponent.cxx b/HLT/TPCLib/AliHLTTPCClusterDumpComponent.cxx
index e537e75e498fd4def8a5e8f85e8f72c0d325953a..249632fefbe2eb4ec19c577fbf3068f9170e76d5 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusterDumpComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCClusterDumpComponent.cxx
@@ -110,7 +110,7 @@ int AliHLTTPCClusterDumpComponent::CloseWriter()
   return 0;
 }
 
-int AliHLTTPCClusterDumpComponent::DumpEvent( const AliHLTComponentEventData& evtData,
+int AliHLTTPCClusterDumpComponent::DumpEvent( const AliHLTComponentEventData& /*evtData*/,
                                              const AliHLTComponentBlockData* /*blocks*/, 
                                              AliHLTComponentTriggerData& /*trigData*/ )
 {
@@ -140,7 +140,7 @@ int AliHLTTPCClusterDumpComponent::DumpEvent( const AliHLTComponentEventData& ev
   dump.open(fCurrentFileName.Data());
 
   for (pDesc=GetFirstInputBlock(AliHLTTPCDefinitions::fgkClustersDataType); pDesc!=NULL; pDesc=GetNextInputBlock(), blockno++) {
-    HLTDebug("event %Lu block %d: %s 0x%08x size %d", evtData.fEventID, blockno, DataType2Text(pDesc->fDataType).c_str(), pDesc->fSpecification, pDesc->fSize);
+    HLTDebug("event %Lu block %d: %s 0x%08x size %d", GetEventId(), blockno, DataType2Text(pDesc->fDataType).c_str(), pDesc->fSpecification, pDesc->fSize);
 
     if(pDesc->fDataType!=AliHLTTPCDefinitions::fgkClustersDataType){continue;}
  

diff --git a/HLT/TPCLib/AliHLTTPCNoiseMapComponent.cxx b/HLT/TPCLib/AliHLTTPCNoiseMapComponent.cxx
index 4b35340ac774715dfc02fb8f5adfa083e0e8ea0b..e3c73faadca392efa0a13feb7e872bf3b4d9835d 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCNoiseMapComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCNoiseMapComponent.cxx
@@ -333,7 +333,7 @@ int AliHLTTPCNoiseMapComponent::DoEvent(const AliHLTComponentEventData& evtData,
       //fHistSignal = new TH1F("fHistSignal", "signal distribution per pad",1024,0,1024);
       
       //fHistSignal->Reset();
-      Int_t time = pDigitReader->GetTime();
+      //Int_t time = pDigitReader->GetTime();
      
       for(Int_t i=0;i<pDigitReader->GetBunchSize();i++){
           

diff --git a/HLT/TPCLib/comp/AliHLTTPCCompModelDeconverterComponent.cxx b/HLT/TPCLib/comp/AliHLTTPCCompModelDeconverterComponent.cxx
index 417a397bc63cc965abf30052755e3f5f76316bf7..a74c49414df3c63fb3f084715114a8e4482041e0 100644 (file)
--- a/HLT/TPCLib/comp/AliHLTTPCCompModelDeconverterComponent.cxx
+++ b/HLT/TPCLib/comp/AliHLTTPCCompModelDeconverterComponent.cxx
@@ -78,7 +78,6 @@ void AliHLTTPCCompModelDeconverterComponent::GetOutputDataSize( unsigned long& c
       // see header file for class documentation
       constBase = 8+216*4; // Track count + clusters count
       inputMultiplier = 4.;
-#warning Adapt input Multiplier to something more realistic
     }
 
 // Spawn function, return new instance of this class

diff --git a/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerCalibComponent.h b/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerCalibComponent.h
index a22e8fa3dfc5dbb6b9c1b0a13f20010d070784a8..40c6c6e132f63330104a04947a31a51b4e269816 100644 (file)
--- a/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerCalibComponent.h
+++ b/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerCalibComponent.h
@@ -27,8 +27,8 @@
  *
  * Component ID: \b TPCOfflineTrackerCalib <br>
  * Library: \b libAliHLTTPC.so     <br>
- * Input Data Types: @ref kAliHLTDataTypeAliTObjArray|kAliHLTDataOriginTPC <br>
- * Output Data Types: @ref kAliHLTDataTypeTObjArray|kAliHLTDataOriginTPC <br>
+ * Input Data Types: ::kAliHLTDataTypeTObjArray|::kAliHLTDataOriginTPC <br>
+ * Output Data Types: ::kAliHLTDataTypeTObjArray|::kAliHLTDataOriginTPC <br>
  *
  * <h2>Mandatory arguments:</h2>
  * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->

diff --git a/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerComponent.h b/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerComponent.h
index ed9e1d7f3f487bc1a0f9f9c16afeed09d829260c..7f288d7b0c06596595f826cfb2a629f3b7e18546 100644 (file)
--- a/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerComponent.h
+++ b/HLT/TPCLib/offline/AliHLTTPCOfflineTrackerComponent.h
@@ -27,8 +27,8 @@
  *
  * Component ID: \b TPCOfflineTracker <br>
  * Library: \b libAliHLTTPC.so     <br>
- * Input Data Types: @ref kAliHLTDataTypeAliTObjArray|kAliHLTDataOriginTPC <br>
- * Output Data Types: @ref kAliHLTDataTypeESDTree|kAliHLTDataOriginTPC <br>
+ * Input Data Types: ::kAliHLTDataTypeTObjArray|::kAliHLTDataOriginTPC <br>
+ * Output Data Types: ::kAliHLTDataTypeESDTree|::kAliHLTDataOriginTPC <br>
  *
  * <h2>Mandatory arguments:</h2>
  * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.cxx b/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.cxx
index b59d4de5f05455fad3df53abff73f5b9f5c30b5d..84cd47c36ee96a31f244c3ee3681681547e7450e 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.cxx
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCAGBTracker.cxx
@@ -453,7 +453,7 @@ void AliHLTTPCCAGBTracker::Merging()
     for( Int_t itr=0; itr<slice.NOutTracks(); itr++ ){
       if( fSliceTrackInfos[iSlice][itr].fUsed ) continue;
       //cout<<"\n slice "<<iSlice<<", track "<<itr<<"\n"<<endl;
-      AliHLTTPCCAOutTrack &tCA = slice.OutTracks()[itr];
+      //AliHLTTPCCAOutTrack &tCA = slice.OutTracks()[itr];
       AliHLTTPCCAGBTrack &t = fTracks[fNTracks];
       //t.Param() = tCA.StartPoint();
        //t.Alpha() = slice.Param().Alpha();

diff --git a/HLT/TRD/AliHLTTRDCalibrationComponent.cxx b/HLT/TRD/AliHLTTRDCalibrationComponent.cxx
index a17f492bb0659941ba2b7b71e35d30bf9a2aa3aa..93e9ff472a60287363dc743ecdb82a385076d8a6 100644 (file)
--- a/HLT/TRD/AliHLTTRDCalibrationComponent.cxx
+++ b/HLT/TRD/AliHLTTRDCalibrationComponent.cxx
@@ -48,6 +48,7 @@ ClassImp(AliHLTTRDCalibrationComponent);
    
 AliHLTTRDCalibrationComponent::AliHLTTRDCalibrationComponent()
   : AliHLTCalibrationProcessor()
+  , fTRDCalibraFillHisto(NULL)
   , fOutputPercentage(100) // By default we copy to the output exactly what we got as input  
   , fStrorageDBpath("local://$ALICE_ROOT")
   , fCDB(NULL)
@@ -169,11 +170,11 @@ Int_t AliHLTTRDCalibrationComponent::DeinitCalibration()
   
   // Deinitialization of the component
   // gain histo
-  TH2I *hCH2d = fTRDCalibraFillHisto->GetCH2d(); 
+  //TH2I *hCH2d = fTRDCalibraFillHisto->GetCH2d(); 
   // drift velocity histo
-  TProfile2D *hPH2d = fTRDCalibraFillHisto->GetPH2d(); 
+  //TProfile2D *hPH2d = fTRDCalibraFillHisto->GetPH2d(); 
   // PRF histo
-  TProfile2D *hPRF2d = fTRDCalibraFillHisto->GetPRF2d(); 
+  //TProfile2D *hPRF2d = fTRDCalibraFillHisto->GetPRF2d(); 
 
   if (fCDB)
     {

diff --git a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx
index a182acc397e269624bca9112b8ba03de829e6cb9..c44decd73e4a6616cad333f012ee5dc759e457ff 100644 (file)
--- a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx
+++ b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx
@@ -64,9 +64,9 @@ AliHLTTRDClusterizerComponent::AliHLTTRDClusterizerComponent()
   , fRecoParam(NULL)
   , fCDB(NULL)
   , fMemReader(NULL)
+  , fReconstructor(NULL)
   , fGeometryFileName("")
   , fGeometryFile(NULL)
-  , fReconstructor(NULL)
 {
   // Default constructor
 

diff --git a/HLT/TRD/AliHLTTRDTrackerComponent.cxx b/HLT/TRD/AliHLTTRDTrackerComponent.cxx
index 2a294acb419d37fbb94ccf49e7ade074cd484c9c..5991104a77baba6b94c911a30d61dc2669200e65 100644 (file)
--- a/HLT/TRD/AliHLTTRDTrackerComponent.cxx
+++ b/HLT/TRD/AliHLTTRDTrackerComponent.cxx
@@ -248,13 +248,13 @@ int AliHLTTRDTrackerComponent::DoDeinit()
   return 0;
 }
 
-int AliHLTTRDTrackerComponent::DoEvent( const AliHLTComponentEventData & evtData,
-                                       AliHLTComponentTriggerData & trigData )
+int AliHLTTRDTrackerComponent::DoEvent( const AliHLTComponentEventData & /*evtData*/,
+                                       AliHLTComponentTriggerData & /*trigData*/ )
 {
   // Process an event
   
   HLTInfo("Output percentage set to %lu %%", fOutputPercentage );
-  HLTInfo("NofBlocks %lu", evtData.fBlockCnt );
+  HLTInfo("NofBlocks %lu", GetNumberOfInputBlocks() );
 
   AliHLTUInt32_t dBlockSpecification = 0;
 
@@ -262,7 +262,7 @@ int AliHLTTRDTrackerComponent::DoEvent( const AliHLTComponentEventData & evtData
   //   AliHLTUInt32_t triggerDataStructSize = trigData.fStructSize;
   //   AliHLTUInt32_t triggerDataSize = trigData.fDataSize;
   //   void *triggerData = trigData.fData;
-  HLTDebug("Struct size %d Data size %d Data location 0x%x", trigData.fStructSize, trigData.fDataSize, (UInt_t*)trigData.fData);
+  //HLTDebug("Struct size %d Data size %d Data location 0x%x", trigData.fStructSize, trigData.fDataSize, (UInt_t*)trigData.fData);
 
   AliHLTComponentBlockData *dblock = (AliHLTComponentBlockData *)GetFirstInputBlock( AliHLTTRDDefinitions::fgkClusterDataType );
   if (dblock != 0)

diff --git a/HLT/TRD/AliHLTTRDTrackerV1Component.cxx b/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
index 3ea2aa87c8ef3ea2432574036676727cc2734e93..1b5cc35df01a2ab9899517d6b5f9246666c1bb73 100644 (file)
--- a/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
+++ b/HLT/TRD/AliHLTTRDTrackerV1Component.cxx
@@ -59,8 +59,10 @@ AliHLTTRDTrackerV1Component::AliHLTTRDTrackerV1Component()
   , fField(NULL)
   , fGeometryFileName("")
   , fGeometryFile(NULL)
+  , fGeoManager(NULL)
   , fTracker(NULL)
   , fRecoParam(NULL)
+  , fReconstructor(NULL)
 {
   // Default constructor
 
@@ -412,14 +414,14 @@ int AliHLTTRDTrackerV1Component::DoDeinit()
   return 0;
 }
 
-int AliHLTTRDTrackerV1Component::DoEvent( const AliHLTComponentEventData & evtData,
-                                         AliHLTComponentTriggerData & trigData )
+int AliHLTTRDTrackerV1Component::DoEvent( const AliHLTComponentEventData & /*evtData*/,
+                                         AliHLTComponentTriggerData & /*trigData*/ )
 {
   // Process an event
   Bool_t bWriteClusters = fReconstructor->IsWritingClusters();
 
   HLTDebug("Output percentage set to %lu %%", fOutputPercentage );
-  HLTDebug("NofBlocks %lu", evtData.fBlockCnt );
+  HLTDebug("NofBlocks %lu", GetNumberOfInputBlocks() );
   
   AliHLTUInt32_t dBlockSpecification = 0;
 
@@ -428,14 +430,14 @@ int AliHLTTRDTrackerV1Component::DoEvent( const AliHLTComponentEventData & evtDa
   //   AliHLTUInt32_t triggerDataStructSize = trigData.fStructSize;
   //   AliHLTUInt32_t triggerDataSize = trigData.fDataSize;
   //   void *triggerData = trigData.fData;
-  HLTDebug("Struct size %d Data size %d Data location 0x%x", trigData.fStructSize, trigData.fDataSize, (UInt_t*)trigData.fData);
+  //HLTDebug("Struct size %d Data size %d Data location 0x%x", trigData.fStructSize, trigData.fDataSize, (UInt_t*)trigData.fData);
   
   AliHLTComponentBlockData *dblock = (AliHLTComponentBlockData *)GetFirstInputBlock( AliHLTTRDDefinitions::fgkClusterDataType );
   if (dblock != 0)
     {
       AliHLTComponentDataType inputDataType = dblock->fDataType;
       HLTDebug( "Event 0x%08LX (%Lu) received datatype: %s",
-               evtData.fEventID, evtData.fEventID, 
+               GetEventId(), GetEventId(), 
                DataType2Text(inputDataType).c_str());
       dBlockSpecification = dblock->fSpecification;
     }
@@ -479,7 +481,7 @@ int AliHLTTRDTrackerV1Component::DoEvent( const AliHLTComponentEventData & evtDa
        HLTDebug("TClonesArray of clusters: nbEntries = %i", clusterArray->GetEntriesFast());
        Int_t nb = clusterArray->GetEntriesFast();
        for (Int_t i=0; i<nb; i++){
-         AliTRDcluster * cluster = (AliTRDcluster* ) clusterArray->At(i);
+         //AliTRDcluster * cluster = (AliTRDcluster* ) clusterArray->At(i);
          //HLTDebug("Cluster[%i]: detector %i", i, cluster->GetDetector());
        }
   

diff --git a/HLT/configure.ac b/HLT/configure.ac
index 738aa944d6bfd60b8c60d03c85fb7d9a07c2d008..6cdd1ee9bc49062956cc9cbcefe076968b19e60b 100644 (file)
--- a/HLT/configure.ac
+++ b/HLT/configure.ac
@@ -321,6 +321,22 @@ if test ! "x$have_aliroot" = "xno" ; then
   AC_MSG_CHECKING(for version of AliExternalTrackParam)
   AC_MSG_RESULT($externaltrackparam_version)
 
+  dnl The AliShuttleInterface was changed in rev 29388. Some return types
+  dnl had been const, now changed according to gcc 4.3 warnings 
+  AC_MSG_CHECKING(for version of AliShuttleInterface.h)
+    CPPFLAGS="$save_CPPFLAGS $ALIROOT_CPPFLAGS -I${ALICE_ROOT}/"
+    LDFLAGS="$save_LDFLAGS -L${ROOTLIBDIR} $ALIROOT_LDFLAGS"
+    LIBS="$save_LIBS $ROOTLIBS $ALIROOT_LIBS $ALITPC_LIBS"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <AliShuttleInterface.h>],
+                                    [class dummy : public AliShuttleInterface {
+                                    public:
+                                      const UInt_t GetStartTimeDCSQuery() {;}
+                                     };])],
+                                    [AC_DEFINE(SHUTTLE_PRE_REV29388_INTERFACE)
+                                    alishuttleinterface_version=pre.rev.29388],
+                                   [alishuttleinterface_version=up.to.date])
+  AC_MSG_RESULT([$alishuttleinterface_version])
+
   CPPFLAGS=$save_CPPFLAGS
   LDFLAGS=$save_LDFLAGS
   LIBS=$save_LIBS

diff --git a/HLT/pendolino/AliHLTPendolino.cxx b/HLT/pendolino/AliHLTPendolino.cxx
index bd5e951a32da017fd88659a3cc0ccc41ce7056f5..e142ff43c5a2d58a6720d54f057d4c61a33f7bc8 100644 (file)
--- a/HLT/pendolino/AliHLTPendolino.cxx
+++ b/HLT/pendolino/AliHLTPendolino.cxx
@@ -756,11 +756,11 @@ Int_t AliHLTPendolino::initPredictProc(TString detector, Int_t run,
 }
 
 
-UInt_t AliHLTPendolino::GetStartTimeDCSQuery() {
+CONST_PROPERTY UInt_t AliHLTPendolino::GetStartTimeDCSQuery() {
        return fStartTime;
 }
 
-UInt_t AliHLTPendolino::GetEndTimeDCSQuery() {
+CONST_PROPERTY UInt_t AliHLTPendolino::GetEndTimeDCSQuery() {
        return fEndTime;
 }
 

diff --git a/HLT/pendolino/AliHLTPendolino.h b/HLT/pendolino/AliHLTPendolino.h
index 6fcdc8c8faf3d21733ef0e087f6f86681d75ffd0..ef839267d49136dac9b798402d330d454833ee4b 100644 (file)
--- a/HLT/pendolino/AliHLTPendolino.h
+++ b/HLT/pendolino/AliHLTPendolino.h
@@ -22,6 +22,11 @@
 
 //#include "AliHLTPredictionProcessorInterface.h"
 
+#ifdef SHUTTLE_PRE_REV29388_INTERFACE
+#define CONST_PROPERTY const
+#else
+#define CONST_PROPERTY
+#endif
 
 class AliHLTPendolinoLogger;
 
@@ -373,7 +378,7 @@ class AliHLTPendolino : public AliShuttleInterface {
                 * implementation in the Offline Shuttle - there the initial start time
                 * is set to the start-of-data for the complete run.)
                 */
-               virtual UInt_t GetStartTimeDCSQuery();
+               virtual CONST_PROPERTY UInt_t GetStartTimeDCSQuery();
 
                /**
                 * Function to get the end time of the DCS Archive DB request; in HLT
@@ -382,7 +387,7 @@ class AliHLTPendolino : public AliShuttleInterface {
                 * implementation in the Offline Shuttle - there the initial end time
                 * is set to the end-of-data for the complete run.)
                 */
-               virtual UInt_t GetEndTimeDCSQuery();
+               virtual CONST_PROPERTY UInt_t GetEndTimeDCSQuery();
                                
                
        protected:

diff --git a/HLT/pendolino/AliHLTPendolinoLoggerDump.cxx b/HLT/pendolino/AliHLTPendolinoLoggerDump.cxx
index f9398c2b1c3e37359ca6349f6830a650d561e6cc..7c69799bf47c756585d980c3a41a6612c528dfc6 100644 (file)
--- a/HLT/pendolino/AliHLTPendolinoLoggerDump.cxx
+++ b/HLT/pendolino/AliHLTPendolinoLoggerDump.cxx
@@ -41,7 +41,7 @@ AliHLTPendolinoLoggerDump::~AliHLTPendolinoLoggerDump() {
 
 }
 
-void AliHLTPendolinoLoggerDump::log(const char* detector, const char* msg) {
+void AliHLTPendolinoLoggerDump::log(const char* /*detector*/, const char* /*msg*/) {
        // log function dump
 
 }

diff --git a/HLT/pendolino/HLT/AliHLTPredictionProcessorHLT.cxx b/HLT/pendolino/HLT/AliHLTPredictionProcessorHLT.cxx
index 668e48cf110d7d8f11ed8a8828e4ee1044bb1219..7f9053d1b13e2de7464ee30d49e41ad009028c2c 100644 (file)
--- a/HLT/pendolino/HLT/AliHLTPredictionProcessorHLT.cxx
+++ b/HLT/pendolino/HLT/AliHLTPredictionProcessorHLT.cxx
@@ -165,7 +165,7 @@ Bool_t AliHLTPredictionProcessorHLT::GetSensorValue(TMap* dcsAliasMap,
   return kFALSE;
 }
 
-TMap* AliHLTPredictionProcessorHLT::produceTestData(TString aliasName) {
+TMap* AliHLTPredictionProcessorHLT::produceTestData(TString /*aliasName*/) {
        // produces test data for AliHLTPredictionProcessorHLT
     TMap* resultMap = 0;