Coding conventions

diff --git a/STEER/AliCDBGrid.cxx b/STEER/AliCDBGrid.cxx
index 8aea78782431432fbd5561da660035641ac0ad21..d39ed4dff516879dd50eda8027bd83e4605a3876 100644 (file)
--- a/STEER/AliCDBGrid.cxx
+++ b/STEER/AliCDBGrid.cxx
@@ -24,9 +24,7 @@
 #include <TGrid.h>
 #include <TGridResult.h>
 #include <TFile.h>
-#include <TKey.h>
 #include <TROOT.h>
-#include <TSystem.h>
 #include <TObjArray.h>
 #include <TObjString.h>
 #include <TRegexp.h>
@@ -34,6 +32,7 @@
 #include "AliLog.h"
 #include "AliCDBEntry.h"
 #include "AliCDBGrid.h"
+#include "AliCDBMetaData.h"
 
 
 ClassImp(AliCDBGrid)
@@ -560,19 +559,19 @@ Bool_t AliCDBGrid::AddTag(TString& folderToTag, const char* tagname){
 Bool_t AliCDBGrid::TagFileId(TString& filename, const AliCDBId* id){
 // tag stored object in CDB table using object Id's parameters
 
-       TString addTagValue_1 = Form("addTagValue %s CDB ", filename.Data());
-       TString addTagValue_2 = Form("first_run=%d last_run=%d version=%d ",
+       TString addTagValue1 = Form("addTagValue %s CDB ", filename.Data());
+       TString addTagValue2 = Form("first_run=%d last_run=%d version=%d ",
                                        id->GetFirstRun(),
                                        id->GetLastRun(),
                                        id->GetVersion());
-       TString addTagValue_3 = Form("path_level_0=\"%s\" path_level_1=\"%s\" path_level_2=\"%s\"",
+       TString addTagValue3 = Form("path_level_0=\"%s\" path_level_1=\"%s\" path_level_2=\"%s\"",
                                        id->GetLevel0().Data(),
                                        id->GetLevel1().Data(),
                                        id->GetLevel2().Data());
        TString addTagValue = Form("%s%s%s",
-                                       addTagValue_1.Data(),
-                                       addTagValue_2.Data(),
-                                       addTagValue_3.Data());
+                                       addTagValue1.Data(),
+                                       addTagValue2.Data(),
+                                       addTagValue3.Data());
 
        Bool_t result = kFALSE;
        AliDebug(2, Form("Tagging file. Tag command: %s", addTagValue.Data()));
@@ -595,18 +594,18 @@ Bool_t AliCDBGrid::TagFileId(TString& filename, const AliCDBId* id){
 Bool_t AliCDBGrid::TagFileMetaData(TString& filename, const AliCDBMetaData* md){
 // tag stored object in CDB table using object Id's parameters
 
-       TString addTagValue_1 = Form("addTagValue %s CDB_MD ", filename.Data());
-       TString addTagValue_2 = Form("object_classname=\"%s\" responsible=\"%s\" beam_period=%d ",
+       TString addTagValue1 = Form("addTagValue %s CDB_MD ", filename.Data());
+       TString addTagValue2 = Form("object_classname=\"%s\" responsible=\"%s\" beam_period=%d ",
                                        md->GetObjectClassName(),
                                        md->GetResponsible(),
                                        md->GetBeamPeriod());
-       TString addTagValue_3 = Form("aliroot_version=\"%s\" comment=\"%s\"",
+       TString addTagValue3 = Form("aliroot_version=\"%s\" comment=\"%s\"",
                                        md->GetAliRootVersion(),
                                        md->GetComment());
        TString addTagValue = Form("%s%s%s",
-                                       addTagValue_1.Data(),
-                                       addTagValue_2.Data(),
-                                       addTagValue_3.Data());
+                                       addTagValue1.Data(),
+                                       addTagValue2.Data(),
+                                       addTagValue3.Data());
 
        Bool_t result = kFALSE;
        AliDebug(2, Form("Tagging file. Tag command: %s", addTagValue.Data()));
@@ -625,7 +624,7 @@ Bool_t AliCDBGrid::TagFileMetaData(TString& filename, const AliCDBMetaData* md){
 
 //_____________________________________________________________________________
 TList* AliCDBGrid::GetIdListFromFile(const char* fileName){
-
+  // Gets the CDB Id list from the file fileName
        TString turl(fileName);
        turl.Prepend("/alien" + fDBFolder);
        turl += "?se="; turl += fSE.Data();

diff --git a/STEER/AliCDBGrid.h b/STEER/AliCDBGrid.h
index 764fe08b1a32ed28e348e899edd29bc056f576f1..944d7a0d7c54fe22091fe2942fcd666d03c87735 100644 (file)
--- a/STEER/AliCDBGrid.h
+++ b/STEER/AliCDBGrid.h
@@ -13,7 +13,7 @@
 
 #include "AliCDBStorage.h"
 #include "AliCDBManager.h"
-#include "AliCDBMetaData.h"
+class AliCDBMetaData;
 
 class AliCDBGrid: public AliCDBStorage {
        friend class AliCDBGridFactory;
@@ -80,6 +80,7 @@ public:
 
        virtual Bool_t Validate(const char* gridString);
         virtual AliCDBParam* CreateParameter(const char* gridString);
+       virtual ~AliCDBGridFactory(){}
 
 protected:
         virtual AliCDBStorage* Create(const AliCDBParam* param);