Removing compilation warnings.
authoraszostak <aszostak@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 17 Oct 2008 18:47:54 +0000 (18:47 +0000)
committeraszostak <aszostak@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 17 Oct 2008 18:47:54 +0000 (18:47 +0000)
13 files changed:
HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx
HLT/MUON/OfflineInterface/AliHLTMUONESDMaker.cxx
HLT/MUON/OfflineInterface/AliHLTMUONRecHitsSource.cxx
HLT/MUON/OfflineInterface/AliHLTMUONRootifierComponent.cxx
HLT/MUON/OfflineInterface/AliHLTMUONTriggerRecordsSource.cxx
HLT/MUON/OnlineAnalysis/AliHLTMUONClusterFinderComponent.cxx
HLT/MUON/OnlineAnalysis/AliHLTMUONDecisionComponent.cxx
HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructorComponent.cxx
HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSM.cxx
HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.cxx
HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.h
HLT/MUON/OnlineAnalysis/AliHLTMUONTriggerReconstructorComponent.cxx
HLT/MUON/utils/AliHLTMUONDataCheckerComponent.cxx

index ff254f4..12a3c58 100644 (file)
@@ -445,9 +445,9 @@ int AliHLTMUONDigitPublisherComponent::DoInit(int argc, const char** argv)
                                HLTError("Expected a positive number after -firstevent.");
                                return -EINVAL;
                        }
-                       char* end = "";
+                       char* end = NULL;
                        long num = strtol(argv[i], &end, 0);
-                       if (*end != '\0' or num < 0) // Check if the conversion is OK.
+                       if ((end != NULL and *end != '\0') or num < 0) // Check if the conversion is OK.
                        {
                                HLTError("Expected a positive number after -firstevent"
                                        " but got: %s", argv[i]
index f3b2283..cb4a6d2 100644 (file)
@@ -250,10 +250,12 @@ int AliHLTMUONESDMaker::DoEvent(
                                        HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                                DataType2Text(block->fDataType).c_str(), block->fSpecification
                                        );
+#ifdef __DEBUG
                                else
                                        HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                                DataType2Text(block->fDataType).c_str(), block->fSpecification
                                        );
+#endif
                        }
                }
        }
index 580e99b..a65e47c 100644 (file)
@@ -172,9 +172,9 @@ int AliHLTMUONRecHitsSource::DoInit(int argc, const char** argv)
                                HLTError("Expected a positive number after -firstevent.");
                                return -EINVAL;
                        }
-                       char* end = "";
+                       char* end = NULL;
                        long num = strtol(argv[i], &end, 0);
-                       if (*end != '\0' or num < 0) // Check if the conversion is OK.
+                       if ((end != NULL and *end != '\0') or num < 0) // Check if the conversion is OK.
                        {
                                HLTError(
                                        "Expected a positive number after -firstevent"
index 2030f9b..0c1ff34 100644 (file)
@@ -313,10 +313,12 @@ int AliHLTMUONRootifierComponent::DoEvent(
                                        HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                                DataType2Text(block->fDataType).c_str(), block->fSpecification
                                        );
+#ifdef __DEBUG
                                else
                                        HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                                DataType2Text(block->fDataType).c_str(), block->fSpecification
                                        );
+#endif
                        }
                }
        }
index dd588dc..aa6163d 100644 (file)
@@ -196,9 +196,9 @@ int AliHLTMUONTriggerRecordsSource::DoInit(int argc, const char** argv)
                                HLTError("Expected a positive number after -firstevent.");
                                return -EINVAL;
                        }
-                       char* end = "";
+                       char* end = NULL;
                        long num = strtol(argv[i], &end, 0);
-                       if (*end != '\0' or num < 0) // Check if the conversion is OK.
+                       if ((end != NULL and *end != '\0') or num < 0) // Check if the conversion is OK.
                        {
                                HLTError(Form(
                                        "Expected a positive number after -firstevent"
index b43f3c7..3bba055 100644 (file)
@@ -205,7 +205,7 @@ int AliHLTMUONClusterFinderComponent::DoInit(int argc, const char** argv)
        
        if (not DelaySetup())
        {
-               int result = ReadConfigFromCDB();
+               result = ReadConfigFromCDB();
                if (result != 0)
                {
                        // Error messages already generated in ReadConfigFromCDB.
@@ -409,9 +409,9 @@ int AliHLTMUONClusterFinderComponent::DoEvent(
                AliHLTMUONRecHitsBlockWriter outBlock(buffer, bufferSize);
                outBlock.InitCommonHeader();
                AliHLTUInt32_t i = 0;
-               TIter next(clusterStore->CreateIterator());
+               TIter next2(clusterStore->CreateIterator());
                AliMUONVCluster* cluster = NULL;
-               while ( (cluster = static_cast<AliMUONVCluster*>(next())) != NULL )
+               while ( (cluster = static_cast<AliMUONVCluster*>(next2())) != NULL )
                {
                        AliHLTMUONRecHitStruct& hit = outBlock[i++];
                        hit.fFlags = AliHLTMUONUtils::PackRecHitFlags(
index d63ea24..0d7b93e 100644 (file)
@@ -316,7 +316,7 @@ int AliHLTMUONDecisionComponent::DoInit(int argc, const char** argv)
                if (not fLowPtCutSet or not fHighPtCutSet or not fLowMassCutSet or not fHighMassCutSet)
                {
                        HLTInfo("Loading cut parameters from CDB.");
-                       int result = ReadConfigFromCDB(
+                       result = ReadConfigFromCDB(
                                        not fLowPtCutSet, not fHighPtCutSet,
                                        not fLowMassCutSet, not fHighMassCutSet
                                );
@@ -467,10 +467,12 @@ int AliHLTMUONDecisionComponent::DoEvent(
                                HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                        DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification
                                );
+#ifdef __DEBUG
                        else
                                HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                        DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification
                                );
+#endif
                }
        }
        
index 54254f2..49edcf1 100644 (file)
@@ -367,7 +367,7 @@ int AliHLTMUONHitReconstructorComponent::DoInit(int argc, const char** argv)
                        HLTInfo("Loading lookup table information from CDB for DDL %d (ID = %d).",
                                fDDL+1, AliHLTMUONUtils::DDLNumberToEquipId(fDDL)
                        );
-                       int result = ReadLutFromCDB();
+                       result = ReadLutFromCDB();
                        if (result != 0)
                        {
                                // Error messages already generated in ReadLutFromCDB.
@@ -380,7 +380,7 @@ int AliHLTMUONHitReconstructorComponent::DoInit(int argc, const char** argv)
        else
        {
                HLTInfo("Loading lookup table information from file %s.", lutFileName);
-               int result = ReadLookUpTable(lutFileName);
+               result = ReadLookUpTable(lutFileName);
                if (result != 0)
                {
                        // Error messages already generated in ReadLookUpTable.
@@ -397,7 +397,7 @@ int AliHLTMUONHitReconstructorComponent::DoInit(int argc, const char** argv)
                        HLTInfo("Loading DC cut parameters from CDB for DDL %d (ID = %d).",
                                fDDL+1, AliHLTMUONUtils::DDLNumberToEquipId(fDDL)
                        );
-                       int result = ReadDCCutFromCDB();
+                       result = ReadDCCutFromCDB();
                        if (result != 0)
                        {
                                // Error messages already generated in ReadDCCutFromCDB.
@@ -611,10 +611,12 @@ int AliHLTMUONHitReconstructorComponent::DoEvent(
                                HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                        DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification
                                );
+#ifdef __DEBUG
                        else
                                HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                        DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification
                                );
+#endif
                        
                        continue;
                }
index ce2c030..b3c4bcf 100644 (file)
@@ -200,6 +200,7 @@ AliHLTMUONRecHitStruct AliHLTMUONMansoTrackerFSM::AliLine::FindIntersectWithXYPl
        else
                t = 0;
        AliHLTMUONRecHitStruct p;
+       p.fFlags = 0;
        p.fX = fMx*t + fCx;
        p.fY = fMy*t + fCy;
        p.fZ = z;
index fa70206..9294e08 100644 (file)
@@ -21,7 +21,7 @@
 ///  @file   AliHLTMUONMansoTrackerFSMComponent.cxx
 ///  @author Artur Szostak <artursz@iafrica.com>,
 ///          Indranil Das <indra.das@saha.ac.in>
-///  @date   
+///  @date   18 Sep 2007
 ///  @brief  Implementation of AliHLTMUONMansoTrackerFSMComponent class.
 ///
 
@@ -406,7 +406,7 @@ int AliHLTMUONMansoTrackerFSMComponent::DoInit(int argc, const char** argv)
                {
                        HLTInfo("Loading configuration parameters from CDB.");
                        
-                       int result = ReadConfigFromCDB();
+                       result = ReadConfigFromCDB();
                        if (result != 0)
                        {
                                // Error messages already generated in ReadConfigFromCDB.
@@ -798,10 +798,12 @@ int AliHLTMUONMansoTrackerFSMComponent::DoEvent(
                                HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                        DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification
                                );
+#ifdef __DEBUG
                        else
                                HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                        DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification
                                );
+#endif
                }
        }
   
index d3a3473..a3a300d 100644 (file)
@@ -23,7 +23,7 @@
 ///  @file   AliHLTMUONMansoTrackerFSMComponent.h
 ///  @author Artur Szostak <artursz@iafrica.com>,
 ///          Indranil Das <indra.das@saha.ac.in>
-///  @date   
+///  @date   18 Sep 2007
 ///  @brief  Tracker component for the dimuon HLT using the Manso algorithm
 ///          implemented as a finite state machine.
 ///
index 4442377..4cbb99b 100644 (file)
@@ -432,7 +432,7 @@ int AliHLTMUONTriggerReconstructorComponent::DoInit(int argc, const char** argv)
                        HLTInfo("Loading lookup table information from CDB for DDL %d (ID = %d).",
                                fDDL+1, AliHLTMUONUtils::DDLNumberToEquipId(fDDL)
                        );
-                       int result = ReadLutFromCDB();
+                       result = ReadLutFromCDB();
                        if (result != 0)
                        {
                                // Error messages already generated in ReadLutFromCDB.
@@ -446,7 +446,7 @@ int AliHLTMUONTriggerReconstructorComponent::DoInit(int argc, const char** argv)
        else
        {
                HLTInfo("Loading lookup table information from file %s.", lutFileName);
-               int result = ReadLookUpTable(lutFileName);
+               result = ReadLookUpTable(lutFileName);
                if (result != 0)
                {
                        // Error messages already generated in ReadLookUpTable.
@@ -468,7 +468,7 @@ int AliHLTMUONTriggerReconstructorComponent::DoInit(int argc, const char** argv)
                                fDDL+1, AliHLTMUONUtils::DDLNumberToEquipId(fDDL)
                        );
                        
-                       int result = ReadConfigFromCDB(not fZmiddleSpecified, not fBLSpecified);
+                       result = ReadConfigFromCDB(not fZmiddleSpecified, not fBLSpecified);
                        if (result != 0)
                        {
                                // Error messages already generated in ReadConfigFromCDB.
@@ -613,10 +613,12 @@ int AliHLTMUONTriggerReconstructorComponent::DoEvent(
                                HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                        DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification
                                );
+#ifdef __DEBUG
                        else
                                HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X",
                                        DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification
                                );
+#endif
                        
                        continue;
                }
index e494902..7231499 100644 (file)
@@ -391,12 +391,14 @@ int AliHLTMUONDataCheckerComponent::DoEvent(
                                                        DataType2Text(blocks[n].fDataType).c_str(),
                                                        blocks[n].fSpecification
                                                );
+#ifdef __DEBUG
                                        else
                                                HLTDebug("Received a data block of a type we cannot"
                                                        " handle: '%s', spec: 0x%8.8X",
                                                        DataType2Text(blocks[n].fDataType).c_str(),
                                                        blocks[n].fSpecification
                                                );
+#endif
                                }
                        }