Removing a comma that gcc 3.4 does not like ;-)

[u/mrichter/AliRoot.git] / MUON / AliMUONPainterDataSourceFrame.cxx

diff --git a/MUON/AliMUONPainterDataSourceFrame.cxx b/MUON/AliMUONPainterDataSourceFrame.cxx
index 59466b99bf9449a9478e45c14631f9bb2995cb0b..1866ebdfc716c5536329ac4d25fdca8356ece98b 100644 (file)
--- a/MUON/AliMUONPainterDataSourceFrame.cxx
+++ b/MUON/AliMUONPainterDataSourceFrame.cxx
@@ -22,7 +22,7 @@
 #include "AliMUONPainterDataSourceItem.h"
 #include "AliMUONPainterEnv.h"
 #include "AliMUONPainterHelper.h"
-#include "AliMUONPainterRegistry.h"
+#include "AliMUONPainterDataRegistry.h"
 #include "AliMUONRecoParam.h"
 #include "AliMUONTrackerACFDataMaker.h"
 #include "AliMUONTrackerDataMaker.h"
@@ -74,7 +74,7 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
   fOCDBSelector(new TGGroupFrame(this,"OCDB Path",kHorizontalFrame)),
   fDataReaders(new TGGroupFrame(this,"Data sources")),
   fFilePath(new TGTextEntry(fRawSelector21,"")),
-  fOCDBPath(new TGTextEntry(fOCDBSelector,"")),
+  fOCDBPath(new TGTextEntry(fOCDBSelector,"alien://folder=/alice/data/2009/OCDB")),
   fRunSelector(new TGNumberEntry(fOCDBSelector,0)),
   fOCDBTypes(new TGComboBox(fOCDBSelector)),
   fRecentSources(new TGComboBox(fRecentSourceSelector)),
@@ -85,7 +85,7 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
 {
   /// Ctor
   
-    AliMUONPainterRegistry* reg = AliMUONPainterRegistry::Instance();
+    AliMUONPainterDataRegistry* reg = AliMUONPainterDataRegistry::Instance();
     
     reg->Connect("DataMakerWasRegistered(AliMUONVTrackerDataMaker*)",
                  "AliMUONPainterDataSourceFrame",
@@ -171,12 +171,13 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
     
     /// OCDB selection
     
-    fOCDBTypes->AddEntry("Pedestals",0);
-    fOCDBTypes->AddEntry("Gains",1);
-    fOCDBTypes->AddEntry("Capacitances",2);
-    fOCDBTypes->AddEntry("HV",3);
-    fOCDBTypes->Select(0);
-    fOCDBTypes->Resize(100,20);
+  fOCDBTypes->AddEntry("Pedestals",0);
+  fOCDBTypes->AddEntry("Gains",1);
+  fOCDBTypes->AddEntry("Capacitances",2);
+  fOCDBTypes->AddEntry("HV",3);
+  fOCDBTypes->AddEntry("Occupancy",4);
+  fOCDBTypes->Select(0);
+  fOCDBTypes->Resize(100,20);
     
     TGButton* createOCDBButton = new TGTextButton(fOCDBSelector,"Create data source");
     createOCDBButton->Connect("Clicked()",
@@ -205,7 +206,9 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
     
     fACFTypes->AddEntry("Pedestals",0);
     fACFTypes->AddEntry("Gains",1);
-    fACFTypes->AddEntry("Capacitances",2);
+  fACFTypes->AddEntry("Capacitances",2);
+  fACFTypes->AddEntry("HV",3);
+  fACFTypes->AddEntry("Occupancy",4);
     fACFTypes->Select(0);
     fACFTypes->Resize(100,20);
     
@@ -333,10 +336,7 @@ AliMUONPainterDataSourceFrame::CreateOCDBDataSource()
   TGTextLBEntry* t = static_cast<TGTextLBEntry*>(fOCDBTypes->GetSelectedEntry());
   TString type = t->GetText()->GetString();
   
-  CreateOCDBDataSource(cdbPath,runNumber,type);
-  
-  fOCDBPath->SetText("");
-  fRunSelector->SetNumber(0);  
+  CreateOCDBDataSource(cdbPath,runNumber,type);  
 }
 
 //_____________________________________________________________________________
@@ -382,7 +382,7 @@ AliMUONPainterDataSourceFrame::CreateACFDataSource(const TString& acfPath, const
   
   if ( reader->IsValid() ) 
   {
-    AliMUONPainterRegistry::Instance()->Register(reader);
+    AliMUONPainterDataRegistry::Instance()->Register(reader);
     
     AliMUONPainterEnv* env = AliMUONPainterHelper::Instance()->Env();
     
@@ -415,7 +415,7 @@ AliMUONPainterDataSourceFrame::CreateOCDBDataSource(const TString& cdbPath,
   
   if ( reader->IsValid() ) 
   {
-    AliMUONPainterRegistry::Instance()->Register(reader);
+    AliMUONPainterDataRegistry::Instance()->Register(reader);
     
     AliMUONPainterEnv* env = AliMUONPainterHelper::Instance()->Env();
     
@@ -589,7 +589,7 @@ AliMUONPainterDataSourceFrame::CreateRawDataSource(const TString& uri)
   
   reader->SetSource(filename.Data());
   
-  AliMUONPainterRegistry::Instance()->Register(reader);
+  AliMUONPainterDataRegistry::Instance()->Register(reader);
   
   AliMUONPainterEnv* env = AliMUONPainterHelper::Instance()->Env();