]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - MUON/AliMUONPainterDataSourceFrame.cxx
Adding a tool to mchview to compare alignments (Philippe P. ; Laurent)
[u/mrichter/AliRoot.git] / MUON / AliMUONPainterDataSourceFrame.cxx
index 0fcf99a761a257c3db42d9f9d71301b85368b565..6a2c8b24abb9352247238818bba53ff17077c241 100644 (file)
 
 // $Id$
 
+#include <cstdlib>
 #include "AliMUONPainterDataSourceFrame.h"
 
-
 #include "AliLog.h"
+#include "AliCDBEntry.h"
+#include "AliCDBManager.h"
+#include "AliMUONChamberPainter.h"
+#include "AliMUONMchViewApplication.h"
+#include "AliMUONPainterDataRegistry.h"
 #include "AliMUONPainterDataSourceItem.h"
 #include "AliMUONPainterEnv.h"
 #include "AliMUONPainterHelper.h"
+#include "AliMUONPainterMatrix.h"
 #include "AliMUONPainterRegistry.h"
-#include "AliMUONTrackerCalibratedDataMaker.h"
-#include "AliMUONTrackerOCDBDataMaker.h"
-#include "AliMUONTrackerRawDataMaker.h"
-#include "AliRawReaderDate.h"
-#include "AliRawReaderRoot.h"
+#include "AliMUONRecoParam.h"
+#include "AliMUONTrackerConditionDataMaker.h"
+#include "AliMUONTrackerDataMaker.h"
+#include "AliRawReader.h"
+#include <TCanvas.h>
 #include <TGButton.h>
 #include <TGComboBox.h>
 #include <TGFileDialog.h>
@@ -36,6 +42,7 @@
 #include <TGrid.h>
 #include <TObjArray.h>
 #include <TObjString.h>
+#include <TMath.h>
 #include <TRegexp.h>
 #include <TString.h>
 #include <TSystem.h>
@@ -63,36 +70,44 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
   fRawSelector2(new TGCompositeFrame(fRawSelector,w,h,kVerticalFrame)),
   fRawSelector21(new TGCompositeFrame(fRawSelector2,w,h,kHorizontalFrame)),
   fRawSelector22(new TGCompositeFrame(fRawSelector2,w,h,kHorizontalFrame)),
+  fRawSelector24(new TGCompositeFrame(fRawSelector2,w,h,kHorizontalFrame)),
   fRawSelector23(new TGCompositeFrame(fRawSelector2,w,h,kHorizontalFrame)),
-  fCalibrateNoGain(new TGCheckButton(fRawSelector22,"Zero suppress")),
-  fCalibrateGainConstantCapa(new TGCheckButton(fRawSelector22,"Zero suppress + gain (capa cste)")),
-  fCalibrateGain(new TGCheckButton(fRawSelector22,"Full calib (zero suppress + 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)),
-  fRawOCDBPath(new TGTextEntry(fRawSelector22,"")),
+  fEventRangeButton(new TGCheckButton(fRawSelector23,"Event range")),
+  fEventMin(new TGNumberEntry(fRawSelector23,-1,10)),
+  fEventMax(new TGNumberEntry(fRawSelector23,-1,10)),
+  fRawOCDBPath(new TGTextEntry(fRawSelector24,"alien://folder=/alice/data/2012/OCDB")),
   fOCDBSelector(new TGGroupFrame(this,"OCDB Path",kHorizontalFrame)),
   fDataReaders(new TGGroupFrame(this,"Data sources")),
   fFilePath(new TGTextEntry(fRawSelector21,"")),
-  fOCDBPath(new TGTextEntry(fOCDBSelector,"")),
-  fRunSelector(new TGNumberEntry(fOCDBSelector,0)),
+  fOCDBPath(new TGTextEntry(fOCDBSelector,"alien://folder=/alice/data/2012/OCDB")),
+  fRunSelector(new TGNumberEntry(fOCDBSelector,0,10)),
   fOCDBTypes(new TGComboBox(fOCDBSelector)),
   fRecentSources(new TGComboBox(fRecentSourceSelector)),
-  fItems(new TObjArray)
+  fItems(new TObjArray),
+  fACFSelector(new TGGroupFrame(this,"ASCII Calib File",kHorizontalFrame)),
+  fACFPath(new TGTextEntry(fACFSelector,"")),
+  fACFTypes(new TGComboBox(fACFSelector))
 {
   /// Ctor
   
-    AliMUONPainterRegistry* reg = AliMUONPainterRegistry::Instance();
+    AliMUONPainterDataRegistry* reg = AliMUONPainterDataRegistry::Instance();
     
-    reg->Connect("DataReaderWasRegistered(AliMUONVTrackerDataMaker*)",
+    reg->Connect("DataMakerWasRegistered(AliMUONVTrackerDataMaker*)",
                  "AliMUONPainterDataSourceFrame",
                  this,
-                 "DataReaderWasRegistered(AliMUONVTrackerDataMaker*)");
+                 "DataMakerWasRegistered(AliMUONVTrackerDataMaker*)");
     
-    reg->Connect("DataReaderWasUnregistered(AliMUONVTrackerDataMaker*)",
+    reg->Connect("DataMakerWasUnregistered(AliMUONVTrackerDataMaker*)",
                  "AliMUONPainterDataSourceFrame",
                  this,
-                 "DataReaderWasUnregistered(AliMUONVTrackerDataMaker*)");
+                 "DataMakerWasUnregistered(AliMUONVTrackerDataMaker*)");
     
     fItems->SetOwner(kFALSE);
     
@@ -117,7 +132,7 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
     
     fRecentSourceSelector->AddFrame(fRecentSources,new TGLayoutHints(kLHintsExpandX | kLHintsTop,5,5,5,5));
     fRecentSourceSelector->AddFrame(createRecentButton,new TGLayoutHints(kLHintsTop,5,5,5,5));
-                                    
+                     
     /// Raw file selection
     
     TGButton* openButton = new TGPictureButton(fRawSelector21,
@@ -126,6 +141,7 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
                                         
     fRawSelector2->AddFrame(fRawSelector21, new TGLayoutHints(kLHintsExpandX,5,5,5,5));
     fRawSelector2->AddFrame(fRawSelector22, new TGLayoutHints(kLHintsExpandX,5,5,5,5));
+    fRawSelector2->AddFrame(fRawSelector24, new TGLayoutHints(kLHintsTop,5,5,5,5));
     fRawSelector2->AddFrame(fRawSelector23, new TGLayoutHints(kLHintsExpandX,5,5,5,5));
 
     fRawSelector21->AddFrame(openButton,new TGLayoutHints(kLHintsTop,5,5,5,5));
@@ -134,19 +150,30 @@ 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(fRawOCDBPath, new TGLayoutHints(kLHintsExpandX | kLHintsTop,5,5,5,5));
+    fRawSelector22->AddFrame(fCalibrateEmelecGain, new TGLayoutHints(kLHintsTop,5,5,5,5));
+  
+    fRawSelector24->AddFrame(fRawOCDBPath, new TGLayoutHints(kLHintsExpandX | kLHintsTop,5,5,5,5));
     fRawOCDBPath->SetEnabled(kFALSE);
     
-    fRawSelector23->AddFrame(fHistogramButton,new TGLayoutHints(kLHintsTop,5,5,5,5));
-    
+    fRawSelector23->AddFrame(fHistogramButton,new TGLayoutHints(kLHintsTop,5,5,5,5));    
     fHistogramButton->Connect("Clicked()","AliMUONPainterDataSourceFrame",this,"HistogramButtonClicked()");
-    
     fHistoMin->SetState(kFALSE);
-    fHistoMax->SetState(kFALSE);
-    
+    fHistoMax->SetState(kFALSE);    
     fRawSelector23->AddFrame(fHistoMin,new TGLayoutHints(kLHintsTop,5,5,5,5));
     fRawSelector23->AddFrame(fHistoMax,new TGLayoutHints(kLHintsTop,5,5,5,5));
     
+
+  fRawSelector23->AddFrame(fEventRangeButton,new TGLayoutHints(kLHintsTop,5,5,5,5));    
+  fEventRangeButton->Connect("Clicked()","AliMUONPainterDataSourceFrame",this,"EventRangeButtonClicked()");
+  fEventMin->SetState(kFALSE);
+  fEventMax->SetState(kFALSE);      
+  
+  fEventMin->SetFormat(TGNumberFormat::kNESInteger);
+  fEventMax->SetFormat(TGNumberFormat::kNESInteger);
+
+  fRawSelector23->AddFrame(fEventMin,new TGLayoutHints(kLHintsTop,5,5,5,5));
+  fRawSelector23->AddFrame(fEventMax,new TGLayoutHints(kLHintsTop,5,5,5,5));
+  
     TGButton* createRawButton = new TGTextButton(fRawSelector,"Create data source");
     
     fRawSelector->AddFrame(fRawSelector2, new TGLayoutHints(kLHintsExpandX | kLHintsTop,5,5,5,5));
@@ -155,6 +182,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",
@@ -168,23 +196,67 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
     
     /// OCDB selection
     
-    fOCDBTypes->AddEntry("Pedestals",0);
-    fOCDBTypes->AddEntry("Gains",1);
-    fOCDBTypes->AddEntry("Capacitances",2);
-    fOCDBTypes->Select(0);
-    fOCDBTypes->Resize(100,20);
+  fOCDBTypes->AddEntry("Config",7);
+  fOCDBTypes->AddEntry("Occupancy",4);
+  fOCDBTypes->AddEntry("HV",3);
+  fOCDBTypes->AddEntry("Pedestals",0);
+  fOCDBTypes->AddEntry("Gains",1);
+  fOCDBTypes->AddEntry("StatusMap",5);
+  fOCDBTypes->AddEntry("Status",6);
+  fOCDBTypes->AddEntry("Capacitances",2);
+  fOCDBTypes->AddEntry("RejectList",8);
+  fOCDBTypes->Select(0);
+  fOCDBTypes->Resize(80,20);
     
     TGButton* createOCDBButton = new TGTextButton(fOCDBSelector,"Create data source");
     createOCDBButton->Connect("Clicked()",
                              "AliMUONPainterDataSourceFrame",
                              this,
                              "CreateOCDBDataSource()");
-    
-    
+
+  const char* ocdbToolTip = "Use URL style for either alien or local OCDB (foo://bar). For example :\n"
+  "alien://folder=/alice/data.../OCDB\n"
+  "or\nlocal:///home/user/aliroot (mind the 3 slashes there !)";
+  
+  fRawOCDBPath->SetToolTipText(ocdbToolTip);
+  fOCDBPath->SetToolTipText(ocdbToolTip);
+  
     fOCDBSelector->AddFrame(fOCDBPath,new TGLayoutHints(kLHintsExpandX | kLHintsTop,5,5,5,5));    
     fOCDBSelector->AddFrame(fRunSelector,new TGLayoutHints(kLHintsTop,5,5,5,5));
     fOCDBSelector->AddFrame(fOCDBTypes,new TGLayoutHints(kLHintsExpandX | kLHintsTop,5,5,5,5));
     fOCDBSelector->AddFrame(createOCDBButton,new TGLayoutHints(kLHintsTop,5,5,5,5));
+    
+    
+    /// ASCII calibration file selection
+    
+    TGButton* openButtonACF = new TGPictureButton(fACFSelector,
+                                                  gClient->GetPicture("fileopen.xpm"));
+    openButtonACF->SetToolTipText("Click to open file dialog");
+
+  fACFTypes->AddEntry("Config",7);
+  fACFTypes->AddEntry("Occupancy",4);
+  fACFTypes->AddEntry("Pedestals",0);
+  fACFTypes->AddEntry("Gains",1);
+  fACFTypes->AddEntry("Capacitances",2);
+  fACFTypes->Select(0);
+  fACFTypes->Resize(100,20);
+    
+    fACFSelector->AddFrame(openButtonACF,new TGLayoutHints(kLHintsTop,5,5,5,5));                                      
+    fACFSelector->AddFrame(fACFPath, new TGLayoutHints(kLHintsExpandX | kLHintsTop,5,5,5,5));
+    fACFSelector->AddFrame(fACFTypes,new TGLayoutHints(kLHintsExpandX | kLHintsTop,5,5,5,5));
+
+    TGButton* createACFButton = new TGTextButton(fACFSelector,"Create data source");
+    createACFButton->Connect("Clicked()",
+                              "AliMUONPainterDataSourceFrame",
+                              this,                              
+                             "CreateACFDataSource()");
+    
+    openButtonACF->Connect("Clicked()",
+                           "AliMUONPainterDataSourceFrame",
+                           this,
+                           "OpenFileDialogACF()");
+    
+    fACFSelector->AddFrame(createACFButton,new TGLayoutHints(kLHintsTop,5,5,5,5));
 
     AddFrame(fRecentSourceSelector,new TGLayoutHints(kLHintsExpandX,10,10,10,10));
 
@@ -192,6 +264,8 @@ AliMUONPainterDataSourceFrame::AliMUONPainterDataSourceFrame(const TGWindow* p,
 
     AddFrame(fOCDBSelector,new TGLayoutHints(kLHintsExpandX,10,10,10,10));
 
+    AddFrame(fACFSelector,new TGLayoutHints(kLHintsExpandX,10,10,10,10));
+    
     AddFrame(fDataReaders, new TGLayoutHints(kLHintsExpandX,10,10,10,10));
     
 }
@@ -235,7 +309,8 @@ AliMUONPainterDataSourceFrame::CalibrateButtonClicked()
   
   if ( fCalibrateNoGain->IsOn() ||
        fCalibrateGainConstantCapa->IsOn() ||
-       fCalibrateGain->IsOn() ) 
+       fCalibrateGain->IsOn() || 
+       fCalibrateEmelecGain->IsOn() ) 
   {
     fRawOCDBPath->SetEnabled(kTRUE);
     fRawOCDBPath->SetFocus();
@@ -264,6 +339,42 @@ AliMUONPainterDataSourceFrame::HistogramButtonClicked()
   }
 }
 
+//_____________________________________________________________________________
+void
+AliMUONPainterDataSourceFrame::EventRangeButtonClicked()
+{
+  /// EventRange button was clicked.
+  
+  if ( fEventRangeButton->IsOn() )
+  {
+    fEventMin->SetState(kTRUE);
+    fEventMax->SetState(kTRUE);
+  }
+  else
+  {
+    fEventMin->SetIntNumber(-1);
+    fEventMax->SetIntNumber(-1);
+    fEventMin->SetState(kFALSE);
+    fEventMax->SetState(kFALSE);
+  }
+}
+
+//_____________________________________________________________________________
+void
+AliMUONPainterDataSourceFrame::CreateACFDataSource()
+{
+  /// Create an ACF data source (using information from the widgets)
+  
+  TString acfPath = fACFPath->GetText();
+  TGTextLBEntry* t = static_cast<TGTextLBEntry*>(fACFTypes->GetSelectedEntry());
+  TString type = t->GetText()->GetString();
+  
+  CreateACFDataSource(acfPath,type);
+  
+  fACFPath->SetText("");
+}
+
+
 //_____________________________________________________________________________
 void
 AliMUONPainterDataSourceFrame::CreateOCDBDataSource()
@@ -275,12 +386,25 @@ AliMUONPainterDataSourceFrame::CreateOCDBDataSource()
   TGTextLBEntry* t = static_cast<TGTextLBEntry*>(fOCDBTypes->GetSelectedEntry());
   TString type = t->GetText()->GetString();
   
-  CreateOCDBDataSource(cdbPath,runNumber,type);
+  CreateOCDBDataSource(cdbPath,runNumber,type);  
+}
+
+//_____________________________________________________________________________
+void
+AliMUONPainterDataSourceFrame::CreateACFDataSource(const TString& uri)
+{
+  /// Create an ACF data source, given it's URI
+  
+  TObjArray* a = uri.Tokenize(";");
+  TString acfPath = static_cast<TObjString*>(a->At(1))->String();
+  TString type = static_cast<TObjString*>(a->At(2))->String();
+  
+  CreateACFDataSource(acfPath,type);
   
-  fOCDBPath->SetText("");
-  fRunSelector->SetNumber(0);  
+  delete a;
 }
 
+
 //_____________________________________________________________________________
 void
 AliMUONPainterDataSourceFrame::CreateOCDBDataSource(const TString& uri)
@@ -299,19 +423,20 @@ AliMUONPainterDataSourceFrame::CreateOCDBDataSource(const TString& uri)
 
 //_____________________________________________________________________________
 void
-AliMUONPainterDataSourceFrame::CreateOCDBDataSource(const TString& cdbPath,
-                                                    Int_t runNumber,
-                                                    const TString& type)
+AliMUONPainterDataSourceFrame::RegisterDataSource(AliMUONVTrackerDataMaker* reader,
+                                                  const char* dsName)
 {
-  /// Create an OCDB data source for a given (path,runnumber,type) triplet
-  
-  AliMUONVTrackerDataMaker* reader = new AliMUONTrackerOCDBDataMaker(cdbPath.Data(),
-                                                                       runNumber,
-                                                                       type.Data());
-  
-  if ( reader->IsValid() ) 
+  /// Register a new data source
+  if ( reader && reader->IsValid() ) 
   {
-    AliMUONPainterRegistry::Instance()->Register(reader);
+    AliMUONMchViewApplication* app = dynamic_cast<AliMUONMchViewApplication*>(gApplication);
+    if (!app)
+    {
+      AliError("Could not cast application to the expected type ! CHECK THAT !");
+    }
+    
+    AliMUONPainterDataRegistry::Instance()->Register(reader);
     
     AliMUONPainterEnv* env = AliMUONPainterHelper::Instance()->Env();
     
@@ -319,16 +444,132 @@ AliMUONPainterDataSourceFrame::CreateOCDBDataSource(const TString& cdbPath,
     
     env->Set(fgkNumberOfDataSourcesKey,n+1);
     
-    TString ds(Form("OCDB;%s;%d;%s",cdbPath.Data(),runNumber,type.Data()));
-    
-    env->Set(Form(fgkDataSourceURIKey,n),ds.Data());
+    env->Set(Form(fgkDataSourceURIKey,n),dsName);
     
     env->Save();
     
-    AddRecentSource(ds.Data());
+    AddRecentSource(dsName);
+    
+    if ( app ) 
+    {
+      
+      TString name(dsName);
+      name.ToUpper();
+      
+      if ( name.Contains("PED") )
+      {
+        CreatePedestalCanvases(reader->Data());
+      }
+    }
+  }  
+}
+
+//_____________________________________________________________________________
+void
+AliMUONPainterDataSourceFrame::CreatePedestalCanvases(AliMUONVTrackerData* data,
+                                                      Double_t pedMin, Double_t pedMax,
+                                                      Double_t sigmaMin, Double_t sigmaMax)
+{
+  /// Create 4 canvases with the pedestals contained in data
+  /// to show mean and sigma, for bending and non bending, with given limits
+                                                 
+  TList matrices;
+  
+  AliMUONAttPainter att[2];
+  
+  att[0].SetViewPoint(kTRUE,kFALSE);
+  att[0].SetCathode(kFALSE,kFALSE);
+  att[0].SetPlane(kTRUE,kFALSE);
+  
+  att[1].SetViewPoint(kTRUE,kFALSE);
+  att[1].SetCathode(kFALSE,kFALSE);
+  att[1].SetPlane(kFALSE,kTRUE);
+  
+  for ( Int_t iatt = 0; iatt < 2; ++iatt ) 
+  {
+    matrices.Add(CreateFullTracker(data,0,pedMin,pedMax,att[iatt]));
+    matrices.Add(CreateFullTracker(data,1,sigmaMin,sigmaMax,att[iatt]));
+  }
+  
+  TIter next(&matrices);
+  AliMUONPainterMatrix* matrix;
+  
+  Int_t w = TMath::Nint(gClient->GetDisplayWidth()*0.9);
+  Int_t h = TMath::Nint(gClient->GetDisplayHeight()*0.9);
+  
+  Int_t x[] = { 0, 0, 20 + w/2, 20 + w/2 };
+  Int_t y[] = { 0, h/2+30, 0, h/2+30 };
+  
+  Int_t i(0);
+  
+  while ( ( matrix = static_cast<AliMUONPainterMatrix*>(next())) )
+  {
+    TCanvas* c = matrix->CreateCanvas(x[i],y[i],w/2,h/2);
+    c->Draw();
+    c->SaveAs(Form("%s.png",c->GetName()));
+    ++i;
   }
 }
 
+//_____________________________________________________________________________
+AliMUONPainterMatrix*
+AliMUONPainterDataSourceFrame::CreateFullTracker(AliMUONVTrackerData* data, 
+                                                 Int_t dim, 
+                                                 Double_t xmin, Double_t xmax,
+                                                 const AliMUONAttPainter& att)
+{
+  /// Generate, draw and register a matrix of 10 painters to show all the tracker
+  /// chambers
+    
+  AliMUONPainterMatrix* matrix = new AliMUONPainterMatrix("Tracker",5,2);
+  
+  for ( Int_t ichamber = 0; ichamber < 10; ++ichamber )
+  {
+    AliMUONVPainter* painter = new AliMUONChamberPainter(att,ichamber);
+    
+    painter->SetResponder("BUSPATCH");
+    
+    painter->SetOutlined("*",kFALSE);
+    
+    matrix->Adopt(painter);    
+  }
+  
+  matrix->SetData("MANU",data,dim);    
+  matrix->SetDataRange(xmin,xmax);    
+  
+  AliMUONPainterRegistry::Instance()->Register(matrix);
+    
+  return matrix;
+}
+
+
+//_____________________________________________________________________________
+void
+AliMUONPainterDataSourceFrame::CreateACFDataSource(const TString& acfPath, const TString& type)
+{
+  /// Create an ACF data source for a given (path,type) 
+
+  AliMUONVTrackerDataMaker* reader = new AliMUONTrackerConditionDataMaker(acfPath.Data(),
+                                                                          type.Data());
+  
+  RegisterDataSource(reader,Form("ACF;%s;%s",acfPath.Data(),type.Data()));
+}
+
+//_____________________________________________________________________________
+void
+AliMUONPainterDataSourceFrame::CreateOCDBDataSource(const TString& cdbPath,
+                                                    Int_t runNumber,
+                                                    const TString& type)
+{
+  /// Create an OCDB data source for a given (path,runnumber,type) triplet
+  
+  AliMUONVTrackerDataMaker* reader = new AliMUONTrackerConditionDataMaker(runNumber,
+                                                                          cdbPath.Data(),
+                                                                          type.Data());
+  
+  RegisterDataSource(reader,Form("OCDB;%s;%d;%s",cdbPath.Data(),runNumber,type.Data()));
+}
+
 //_____________________________________________________________________________
 void 
 AliMUONPainterDataSourceFrame::CreateRawDataSource()
@@ -336,16 +577,25 @@ AliMUONPainterDataSourceFrame::CreateRawDataSource()
   /// Create a new raw data source (using info from the widgets)
   
   TString uri(gSystem->ExpandPathName(fFilePath->GetText()));
+
+  TString name("RAW");
+  Bool_t fromMemory(kFALSE);
   
-  if ( gSystem->AccessPathName(uri.Data()) )
+  if ( uri.Contains(TRegexp("^mem")) )
   {
-    AliError(Form("File %s does not exist",uri.Data()));
-    fFilePath->SetText("");
-    return;
+    fromMemory = kTRUE;
+  }
+  else
+  {
+    if ( gSystem->AccessPathName(uri.Data()) )
+    {
+      AliError(Form("File %s does not exist",uri.Data()));
+      fFilePath->SetText("");
+      return;
+    }
   }
 
   TString calibMode("");
-  TString name("RAW");
   
   if ( fCalibrateGain->IsOn() ) 
   {
@@ -358,6 +608,12 @@ AliMUONPainterDataSourceFrame::CreateRawDataSource()
     calibMode = "GAINCONSTANTCAPA";
     name = "CALG";
   }
+
+  if ( fCalibrateEmelecGain->IsOn() ) 
+  {
+    calibMode = "INJECTIONGAIN";
+    name = "CALE";
+  }
   
   if ( fCalibrateNoGain->IsOn() ) 
   {
@@ -365,13 +621,16 @@ AliMUONPainterDataSourceFrame::CreateRawDataSource()
     name = "CALZ";
   }
   
-  uri = Form("%s%s;%s;%s;%s;%s;%s",
+  uri = Form("%s%s%s;%s;%s;%s;%s;%s;%s;%s",
              ( fHistogramButton->IsOn() ? "H":""),
+             ( fromMemory ? "M" : ""),
              name.Data(),uri.Data(),
              ( strlen(fRawOCDBPath->GetText()) > 0 ? fRawOCDBPath->GetText() : " "),
              ( calibMode.Length() > 0 ? calibMode.Data() : " "),
              Form("%e",fHistoMin->GetNumber()),
-             Form("%e",fHistoMax->GetNumber()));
+             Form("%e",fHistoMax->GetNumber()),
+             Form("%d",(Int_t)(fEventMin->GetIntNumber())),
+             Form("%d",(Int_t)(fEventMax->GetIntNumber())));
   
   if ( CreateRawDataSource(uri) )
   {
@@ -391,6 +650,8 @@ AliMUONPainterDataSourceFrame::CreateRawDataSource(const TString& uri)
   TString calibMode;
   TString sxmin("0.0");
   TString sxmax("4096.0");
+  TString emin("-1");
+  TString emax("-1");
   
   TObjArray* a = uri.Tokenize(";");
   
@@ -418,38 +679,51 @@ AliMUONPainterDataSourceFrame::CreateRawDataSource(const TString& uri)
     sxmax = static_cast<TObjString*>(a->At(5))->String();
   }
   
+  if ( a->GetLast() > 5 )
+  {
+    emin = static_cast<TObjString*>(a->At(6))->String();
+  }
+
+  if ( a->GetLast() > 6 )
+  {
+    emax = static_cast<TObjString*>(a->At(7))->String();
+  }
+  
   AliRawReader* rawReader = 0x0;
 
-  if ( filename.Contains(TRegexp(".root$")) ) 
+  if ( filename.Contains(TRegexp("^alien")) )
   {
-    AliDebug(1,"Using RawReaderRoot");
-    if ( filename.Contains(TRegexp("^alien")) )
+    // insure we've initialized the grid...
+    if (!gGrid)
     {
-      // insure we've initialized the grid...
-      if (!gGrid)
-      {
-        TGrid::Connect("alien://");
-      }
+      TGrid::Connect("alien://");
     }
-         
-    rawReader = new AliRawReaderRoot(filename.Data());
   }
-  else 
+  
+  rawReader = AliRawReader::Create(filename.Data());
+
+  if (!rawReader)
   {
-    /// Anything not .root is supposed to be DATE file
-    AliDebug(1,"Using RawReaderDate");
-    rawReader = new AliRawReaderDate(filename.Data());
+    AliError(Form("Could not open file %s",filename.Data()));
+    fFilePath->SetText("");
+    return kFALSE;
   }
-
+  
   /// Basic test to see if the file is correct
+  /// and to get run numbre
+  Int_t runNumber(-1);
   Bool_t ok = rawReader->NextEvent();
   if (!ok)
   {
-    AliError(Form("File %s does not seem to be a raw data file",filename.Data()));
+    AliError(Form("File %s does not seem to be a raw data file",filename.Data()));    
     fFilePath->SetText("");
     return kFALSE;
   }
-  
+  else
+  {
+    runNumber = rawReader->GetRunNumber();    
+  }
+
   rawReader->RewindEvents();
   
   AliMUONVTrackerDataMaker* reader(0x0);
@@ -459,39 +733,68 @@ AliMUONPainterDataSourceFrame::CreateRawDataSource(const TString& uri)
 
   if ( ocdbPath.Length() > 0 ) 
   {
-    reader = new AliMUONTrackerCalibratedDataMaker(rawReader,ocdbPath.Data(),
-                                                   calibMode.Data(),
-                                                   histogram,
-                                                   sxmin.Atof(),
-                                                   sxmax.Atof());
+        
+    AliMUONRecoParam* recoParam(0x0);
+    
+    AliCDBEntry* e = AliCDBManager::Instance()->Get("MUON/Calib/RecoParam",runNumber);
+    if (e)
+    {
+      TObject* o = e->GetObject();
+      if ( o->IsA() == TObjArray::Class() )
+      {
+        TIter next(static_cast<TObjArray*>(o));
+        AliMUONRecoParam* p;
+        while ( ( p = static_cast<AliMUONRecoParam*>(next()) ))
+        {
+          if ( p->IsDefault()) recoParam = p;
+        }
+      }
+      else
+      {
+        recoParam = static_cast<AliMUONRecoParam*>(o);
+      }
+    }
+    
+    reader = new AliMUONTrackerDataMaker(recoParam,
+                                         rawReader,
+                                         ocdbPath.Data(),
+                                         calibMode.Data(),
+                                         histogram,
+                                         sxmin.Atof(),
+                                         sxmax.Atof());
   }
   else
   {
-    reader = new AliMUONTrackerRawDataMaker(rawReader,histogram);
+    reader = new AliMUONTrackerDataMaker(rawReader,histogram);
   }
+
+  reader->SetEventRange(emin.Atoi(),emax.Atoi());
   
   reader->SetSource(filename.Data());
+
+  TString dsName(uri);
   
-  AliMUONPainterRegistry::Instance()->Register(reader);
-  
-  AliMUONPainterEnv* env = AliMUONPainterHelper::Instance()->Env();
-  
-  Int_t n = env->Integer(fgkNumberOfDataSourcesKey);
-  
-  env->Set(fgkNumberOfDataSourcesKey,n+1);
-  
-  env->Set(Form(fgkDataSourceURIKey,n),uri.Data());
-  
-  AddRecentSource(uri.Data());
+  if ( emin.Atoi() <= emax.Atoi() )
+  {
+    // we have an event range
+    if ( emin.Atoi() == emax.Atoi())
+    {
+      dsName += Form("[%d]",emin.Atoi());
+    }
+    else
+    {
+      dsName += Form("[%d,%d]",emin.Atoi(),emax.Atoi());
+    }
+  }
   
-  env->Save();
-
+  RegisterDataSource(reader,dsName.Data());
+                       
   return kTRUE;
 }
 
 //_____________________________________________________________________________
 void 
-AliMUONPainterDataSourceFrame::DataReaderWasRegistered(AliMUONVTrackerDataMaker* reader)
+AliMUONPainterDataSourceFrame::DataMakerWasRegistered(AliMUONVTrackerDataMaker* reader)
 {
   /// Update ourselves as a new data reader was created
   
@@ -500,12 +803,12 @@ AliMUONPainterDataSourceFrame::DataReaderWasRegistered(AliMUONVTrackerDataMaker*
   item->Connect("StartRunning()",
                 "AliMUONPainterDataSourceFrame",
                 this,
-                Form("StartRunning(=(AliMUONPainterDataSourceItem*)(0x%x))",item));
+                "StartRunning()");
 
   item->Connect("StopRunning()",
                 "AliMUONPainterDataSourceFrame",
                 this,
-                Form("StopRunning(=(AliMUONPainterDataSourceItem*)(0x%x))",item));
+                "StopRunning()");
   
   fDataReaders->AddFrame(item);
   
@@ -517,12 +820,33 @@ AliMUONPainterDataSourceFrame::DataReaderWasRegistered(AliMUONVTrackerDataMaker*
 
 //_____________________________________________________________________________
 void 
-AliMUONPainterDataSourceFrame::DataReaderWasUnregistered(AliMUONVTrackerDataMaker* /*reader*/)
+AliMUONPainterDataSourceFrame::DataMakerWasUnregistered(const AliMUONVTrackerDataMaker* maker)
 {
-  /// Update ourselves as a new data reader was deleted
+  /// Update ourselves as a data reader was deleted
+  
+  AliMUONPainterDataSourceItem* theItem(0x0);
+  
+  TIter next(fItems);
+  AliMUONPainterDataSourceItem* item;
+  
+  while ( ( item = static_cast<AliMUONPainterDataSourceItem*>(next()) ) && !theItem )
+  {
+    if ( item->DataMaker() == maker ) 
+    {
+      theItem = item;
+    }
+  }
   
-  // here we should find which (if any) datasourceitem has this reader, and remove it
+  if  (!theItem) return;
   
+  fDataReaders->RemoveFrame(theItem);
+  fItems->Remove(theItem);
+  theItem->DestroyWindow();
+  delete theItem;
+  
+  fDataReaders->MapSubwindows();
+  fDataReaders->Resize();
+
 }
 
 //_____________________________________________________________________________
@@ -540,12 +864,48 @@ AliMUONPainterDataSourceFrame::OpenFileDialog()
     0,0 };
   
   fileInfo.fFileTypes = fileTypes;
+  delete[] fileInfo.fIniDir;
+
+  AliMUONPainterEnv* env = AliMUONPainterHelper::Instance()->Env();
+  
+  fileInfo.fIniDir = StrDup(env->String("LastOpenDir","."));
   
   new TGFileDialog(gClient->GetRoot(),gClient->GetRoot(),
                    kFDOpen,&fileInfo);
   
-  
   fFilePath->SetText(gSystem->ExpandPathName(Form("%s",fileInfo.fFilename)));
+  
+  env->Set("LastOpenDir",fileInfo.fIniDir);
+  env->Save();  
+}
+
+
+//_____________________________________________________________________________
+void
+AliMUONPainterDataSourceFrame::OpenFileDialogACF()
+{
+  /// Open a file dialog to select an ASCII calibration file to be read
+  
+  TGFileInfo fileInfo;
+  
+  const char* fileTypes[] = { 
+    "All files","*",
+    0,0 };
+  
+  fileInfo.fFileTypes = fileTypes;
+  delete[] fileInfo.fIniDir;
+  
+  AliMUONPainterEnv* env = AliMUONPainterHelper::Instance()->Env();
+  
+  fileInfo.fIniDir = StrDup(env->String("LastOpenDirACF","."));
+  
+  new TGFileDialog(gClient->GetRoot(),gClient->GetRoot(),
+                   kFDOpen,&fileInfo);
+  
+  fACFPath->SetText(gSystem->ExpandPathName(Form("%s",fileInfo.fFilename)));
+  
+  env->Set("LastOpenDirACF",fileInfo.fIniDir);
+  env->Save();  
 }
 
 
@@ -560,7 +920,8 @@ AliMUONPainterDataSourceFrame::OpenRecentSource()
   TString uri(t->GetText()->GetString());
   
   if ( uri.Contains(TRegexp("^RAW")) || uri.Contains(TRegexp("^HRAW")) || 
-       uri.Contains(TRegexp("^CAL")) || uri.Contains(TRegexp("^HCAL")) )
+       uri.Contains(TRegexp("^CAL")) || uri.Contains(TRegexp("^HCAL")) ||
+       uri.Contains(TRegexp("^MEM")) )
   {
     CreateRawDataSource(uri);
   }
@@ -568,15 +929,24 @@ AliMUONPainterDataSourceFrame::OpenRecentSource()
   {
     CreateOCDBDataSource(uri);
   }
+  else if ( uri.Contains(TRegexp("^ACF")) )
+  {
+    CreateACFDataSource(uri);
+  }
   
   fRecentSources->Select(-1);
 }
 
 //_____________________________________________________________________________
 void
-AliMUONPainterDataSourceFrame::StartRunning(AliMUONPainterDataSourceItem* item)
+AliMUONPainterDataSourceFrame::StartRunning()
 {
   /// One data source starts running. Disable the Run button of the other ones
+  
+  AliMUONPainterDataSourceItem* item = reinterpret_cast<AliMUONPainterDataSourceItem*> (gTQSender);
+  
+  AliInfo("");
+  
   TIter next(fItems);
   AliMUONPainterDataSourceItem* o;
   while ( ( o = static_cast<AliMUONPainterDataSourceItem*>(next()) ) )
@@ -590,9 +960,10 @@ AliMUONPainterDataSourceFrame::StartRunning(AliMUONPainterDataSourceItem* item)
 
 //_____________________________________________________________________________
 void
-AliMUONPainterDataSourceFrame::StopRunning(AliMUONPainterDataSourceItem* /*item*/)
+AliMUONPainterDataSourceFrame::StopRunning()
 {
   /// One data source stops running. Enable the Run button of all items
+  
   TIter next(fItems);
   AliMUONPainterDataSourceItem* o;
   while ( ( o = static_cast<AliMUONPainterDataSourceItem*>(next()) ) )