Rulechecker-complying update from P.Ganoti (pganoti@phys.uoa.gr)

[u/mrichter/AliRoot.git] / EVE / EveDet / AliEveTRDLoaderManager.cxx

diff --git a/EVE/EveDet/AliEveTRDLoaderManager.cxx b/EVE/EveDet/AliEveTRDLoaderManager.cxx
index 4b86fa537943e77128c88875b6ce195cc1cbeec5..5eaa217ff1fca8c106480ae24404480a25fe3705 100644 (file)
--- a/EVE/EveDet/AliEveTRDLoaderManager.cxx
+++ b/EVE/EveDet/AliEveTRDLoaderManager.cxx
@@ -45,21 +45,21 @@ void AliEveTRDLoaderManager::Add(Int_t type, const Text_t *name, const Text_t *t
 
   AliEveTRDLoader *trdl = 0x0;
   switch(type){
-    case 0:
-      AddElement(new AliEveTRDLoaderSim(name, title));
-      break;
-    case 1:
-    case 2:
-    case 3:
-      AddElement(trdl = new AliEveTRDLoader(name, title));
-      trdl->SetDataType((AliEveTRDLoader::TRDDataTypes)type);
-      break;
-    case 4:
-    case 5:
-      AddElement(trdl = new AliEveTRDLoaderRaw(name, title));
-      trdl->SetDataType((AliEveTRDLoader::TRDDataTypes)type);
-      break;
+  case AliEveTRDLoader::kTRDHits:
+  case AliEveTRDLoader::kTRDDigits:
+  case AliEveTRDLoader::kTRDClusters:
+  case AliEveTRDLoader::kTRDTracklets:
+    AddElement(trdl = new AliEveTRDLoader(name, title));
+    break;
+  case AliEveTRDLoader::kTRDRawRoot:
+  case AliEveTRDLoader::kTRDRawDate:
+    AddElement(trdl = new AliEveTRDLoaderRaw(name, title));
+    break;
+  default:
+    AddElement(trdl = new AliEveTRDLoaderSim(name, title));
+    break;
   }
+  trdl->SetDataType(type);
 
   gEve->Redraw3D();
 }
@@ -113,21 +113,17 @@ AliEveTRDLoaderManagerEditor(const TGWindow* p, Int_t width, Int_t height,
 
   // combo box
   fSelector = new TGComboBox(fHorizontalFrame539,-1,kHorizontalFrame | kSunkenFrame | kDoubleBorder | kOwnBackground);
-  fSelector->AddEntry("MC (gAlice) ",0);
-  fSelector->AddEntry("Digits ",1);
-  fSelector->AddEntry("Clusters ",2);
-  fSelector->AddEntry("Tracklets ",3);
-  fSelector->AddEntry("Raw (ROOT) ",4);
-  fSelector->AddEntry("Raw (DATE) ",5);
+  fSelector->AddEntry("MC (gAlice) ", AliEveTRDLoader::kTRDHits | AliEveTRDLoader::kTRDDigits | AliEveTRDLoader::kTRDClusters);
+  fSelector->AddEntry("Hits ", AliEveTRDLoader::kTRDHits);
+  fSelector->AddEntry("Digits ", AliEveTRDLoader::kTRDDigits);
+  fSelector->AddEntry("Clusters ", AliEveTRDLoader::kTRDClusters);
+  fSelector->AddEntry("Tracklets ", AliEveTRDLoader::kTRDTracklets);
+  fSelector->AddEntry("Raw (ROOT) ", AliEveTRDLoader::kTRDRawRoot);
+  fSelector->AddEntry("Raw (DATE) ", AliEveTRDLoader::kTRDRawDate);
   fSelector->Resize(136,22);
   fHorizontalFrame539->AddFrame(fSelector, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY,2,2,2,2));
-
-  fAdd = new TGTextButton(fHorizontalFrame539, "Add");
-  fAdd->SetTextJustify(36);
-  fAdd->Resize(31,22);
-  fAdd->SetToolTipText("Add selected loader to list");
-  fAdd->Connect("Clicked()", "AliEveTRDLoaderManagerEditor", this, "Add()");
-  fHorizontalFrame539->AddFrame(fAdd, new TGLayoutHints(kLHintsLeft | kLHintsCenterX | kLHintsTop | kLHintsCenterY,2,2,2,2));
+  //fSelector->SetToolTipText("Select TRD data loader and add it to the list.\nThe loader can be removed by clicking the \"Remove\" button");
+  fSelector->Connect("Selected(char*)", "AliEveTRDLoaderManagerEditor", this, "Add(char*)");
   AddFrame(fHorizontalFrame539, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsExpandX,2,2,2,2));
 
   fGroupFrame = 0;
@@ -136,16 +132,9 @@ AliEveTRDLoaderManagerEditor(const TGWindow* p, Int_t width, Int_t height,
 
 
 //______________________________________________________________________________
-void AliEveTRDLoaderManagerEditor::Add()
+void AliEveTRDLoaderManagerEditor::Add(Char_t *name)
 {
   // Slot to add something.
-
-  TGTextLBEntry *entry = (TGTextLBEntry*)fSelector->GetSelectedEntry();
-  if(!entry){
-    AliWarning("Select first the loader type that you want to use from the drop down list.");
-    return;
-  }
-
   if(!fGroupFrame){
     // "TRD Loaders" group frame
     fGroupFrame = new TGGroupFrame(this,"TRD Loaders",kVerticalFrame,TGGroupFrame::GetDefaultGC()(),TGGroupFrame::GetDefaultFontStruct());
@@ -156,41 +145,11 @@ void AliEveTRDLoaderManagerEditor::Add()
     fRemove = new TClonesArray("TGTextButton", 3);
   }
 
-  char *title[] = {"MC loader", "Single file loader", "Raw data loader"};
-  // char *color[] = {"#ff0000", "#0000ff", "#59d454"};
-  int id = fSelector->GetSelected(), type;
-  switch(id){
-    case 1:
-    case 2:
-    case 3:
-      type = 1;
-      break;
-    case 4:
-    case 5:
-      type = 2;
-      break;
-    default:
-      type = 0;
-      break;
-  }
-
 
   // horizontal frame
   TGHorizontalFrame *fHorizontalFrame = new TGHorizontalFrame(fGroupFrame, 264, 26, kHorizontalFrame);
 
-  //   TGFont *ufont = gClient->GetFont("-*-helvetica-(null)-*-*-0-*-*-*-*-*-*-*");
-  //   TGGC   *uGC;           // will reflect user GC changes
-  //   // graphics context changes
-  //   GCValues_t vall717;
-  //   vall717.fMask = kGCForeground | kGCBackground | kGCFillStyle | kGCFont | kGCGraphicsExposures;
-  //   gClient->GetColorByName(color[type], vall717.fForeground);
-  //   gClient->GetColorByName("#c0c0c0", vall717.fBackground);
-  //   vall717.fFillStyle = kFillSolid;
-  //   vall717.fFont = ufont->GetFontHandle();
-  //   vall717.fGraphicsExposures = kFALSE;
-  //   uGC = gClient->GetGC(&vall717, kTRUE);
-
-  TGLabel *fLabel717 = new TGLabel(fHorizontalFrame, entry->GetText()->GetString()/*, uGC->GetGC(), ufont->GetFontStruct(), kChildFrame*/);
+  TGLabel *fLabel717 = new TGLabel(fHorizontalFrame, name);
   fLabel717->SetTextJustify(36);
   fHorizontalFrame->AddFrame(fLabel717, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2));
 
@@ -200,7 +159,7 @@ void AliEveTRDLoaderManagerEditor::Add()
   fRemoveButton->SetTextJustify(36);
   fRemoveButton->Resize(53,22);
   fRemoveButton->Connect("Clicked()", "AliEveTRDLoaderManagerEditor", this, Form("Remove(=%d)", nbutton));
-  fRemoveButton->SetToolTipText(Form("Remove %s Loader", entry->GetText()->GetString()));
+  fRemoveButton->SetToolTipText(Form("Remove %s Loader", name));
   fHorizontalFrame->AddFrame(fRemoveButton, new TGLayoutHints(kLHintsLeft | kLHintsCenterX | kLHintsTop | kLHintsCenterY,2,2,2,2));
 
   fGroupFrame->AddFrame(fHorizontalFrame, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2));
@@ -210,7 +169,25 @@ void AliEveTRDLoaderManagerEditor::Add()
   Resize(GetDefaultSize());
   MapWindow();
 
-  fM->Add(id, entry->GetText()->GetString(), title[type]);
+  const char *title[] = {"MC loader", "Single file loader", "Raw data loader"};
+  // char *color[] = {"#ff0000", "#0000ff", "#59d454"};
+  int id = fSelector->GetSelected(), type;
+  switch(id){
+  case AliEveTRDLoader::kTRDHits:
+  case AliEveTRDLoader::kTRDDigits:
+  case AliEveTRDLoader::kTRDClusters:
+  case AliEveTRDLoader::kTRDTracklets:
+    type = 1;
+    break;
+  case AliEveTRDLoader::kTRDRawRoot:
+  case AliEveTRDLoader::kTRDRawDate:
+    type = 2;
+    break;
+  default:
+    type = 0;
+    break;
+  }
+  fM->Add(id, name, title[type]);
 }