Fixing errors not spotted on Mac

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

diff --git a/MUON/AliMUONPainterDataSourceFrame.cxx b/MUON/AliMUONPainterDataSourceFrame.cxx
index 245cf21ce156899b6790c31abbc8360a64ca1d92..d48913bf33941835affcdecbff944ccde2632626 100644 (file)
--- a/MUON/AliMUONPainterDataSourceFrame.cxx
+++ b/MUON/AliMUONPainterDataSourceFrame.cxx
@@ -64,9 +64,10 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
   fRawSelector21(new TGCompositeFrame(fRawSelector2,w,h,kHorizontalFrame)),
   fRawSelector22(new TGCompositeFrame(fRawSelector2,w,h,kHorizontalFrame)),
   fRawSelector23(new TGCompositeFrame(fRawSelector2,w,h,kHorizontalFrame)),
-  fCalibrateNoGain(new TGCheckButton(fRawSelector22,"Ped subraction")),
-  fCalibrateGainConstantCapa(new TGCheckButton(fRawSelector22,"Ped subraction + gain (capa cste)")),
-  fCalibrateGain(new TGCheckButton(fRawSelector22,"Full calib (Ped subraction + gain with capa)")),
+  fCalibrateNoGain(new TGCheckButton(fRawSelector22,"Ped sub")),
+  fCalibrateGainConstantCapa(new TGCheckButton(fRawSelector22,"Ped sub+gain (capa cste)")),
+  fCalibrateGain(new TGCheckButton(fRawSelector22,"Full calib (Ped sub+gain w/ capa)")),
+  fCalibrateEmelecGain(new TGCheckButton(fRawSelector22,"Full calib (Ped sub+inj gain w/ capa)")),
   fHistogramButton(new TGCheckButton(fRawSelector23,"Histogram")),
   fHistoMin(new TGNumberEntry(fRawSelector23,0)),
   fHistoMax(new TGNumberEntry(fRawSelector23,4096)),
@@ -74,7 +75,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)),
@@ -137,6 +138,7 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
     fRawSelector22->AddFrame(fCalibrateNoGain, new TGLayoutHints(kLHintsTop,5,5,5,5));
     fRawSelector22->AddFrame(fCalibrateGainConstantCapa, new TGLayoutHints(kLHintsTop,5,5,5,5));
     fRawSelector22->AddFrame(fCalibrateGain, new TGLayoutHints(kLHintsTop,5,5,5,5));
+    fRawSelector22->AddFrame(fCalibrateEmelecGain, new TGLayoutHints(kLHintsTop,5,5,5,5));
     fRawSelector22->AddFrame(fRawOCDBPath, new TGLayoutHints(kLHintsExpandX | kLHintsTop,5,5,5,5));
     fRawOCDBPath->SetEnabled(kFALSE);
     
@@ -158,6 +160,7 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
     fCalibrateNoGain->Connect("Clicked()","AliMUONPainterDataSourceFrame",this,"CalibrateButtonClicked()");
     fCalibrateGainConstantCapa->Connect("Clicked()","AliMUONPainterDataSourceFrame",this,"CalibrateButtonClicked()");
     fCalibrateGain->Connect("Clicked()","AliMUONPainterDataSourceFrame",this,"CalibrateButtonClicked()");
+  fCalibrateEmelecGain->Connect("Clicked()","AliMUONPainterDataSourceFrame",this,"CalibrateButtonClicked()");
 
     openButton->Connect("Clicked()",
                         "AliMUONPainterDataSourceFrame",
@@ -171,12 +174,16 @@ 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->AddEntry("StatusMap",5);
+  fOCDBTypes->AddEntry("Status",6);
+  fOCDBTypes->AddEntry("Config",7);
+  fOCDBTypes->Select(0);
+  fOCDBTypes->Resize(100,20);
     
     TGButton* createOCDBButton = new TGTextButton(fOCDBSelector,"Create data source");
     createOCDBButton->Connect("Clicked()",
@@ -205,7 +212,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);
     
@@ -277,7 +286,8 @@ AliMUONPainterDataSourceFrame::CalibrateButtonClicked()
   
   if ( fCalibrateNoGain->IsOn() ||
        fCalibrateGainConstantCapa->IsOn() ||
-       fCalibrateGain->IsOn() ) 
+       fCalibrateGain->IsOn() || 
+       fCalibrateEmelecGain->IsOn() ) 
   {
     fRawOCDBPath->SetEnabled(kTRUE);
     fRawOCDBPath->SetFocus();
@@ -333,10 +343,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);  
 }
 
 //_____________________________________________________________________________
@@ -471,6 +478,12 @@ AliMUONPainterDataSourceFrame::CreateRawDataSource()
     calibMode = "GAINCONSTANTCAPA";
     name = "CALG";
   }
+
+  if ( fCalibrateEmelecGain->IsOn() ) 
+  {
+    calibMode = "INJECTIONGAIN";
+    name = "CALE";
+  }
   
   if ( fCalibrateNoGain->IsOn() ) 
   {