Replace AliEveEventManager token with Event where it was done by a runaway regexp...

diff --git a/EVE/EveDet/AliEveMUONData.cxx b/EVE/EveDet/AliEveMUONData.cxx
index 05ae02a..e7ad206 100644 (file)
--- a/EVE/EveDet/AliEveMUONData.cxx
+++ b/EVE/EveDet/AliEveMUONData.cxx
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 //
 // Sources:
 //

diff --git a/EVE/EveDet/AliEveMUONTrack.cxx b/EVE/EveDet/AliEveMUONTrack.cxx
index 2694e3e..c8b68a6 100644 (file)
--- a/EVE/EveDet/AliEveMUONTrack.cxx
+++ b/EVE/EveDet/AliEveMUONTrack.cxx
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #include "AliEveMUONTrack.h"
 
 #include <EveBase/AliEveEventManager.h>

diff --git a/EVE/EveDet/AliEveT0Module.cxx b/EVE/EveDet/AliEveT0Module.cxx
index 0ca0f7f..eda245a 100644 (file)
--- a/EVE/EveDet/AliEveT0Module.cxx
+++ b/EVE/EveDet/AliEveT0Module.cxx
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
 // The main AliEVE drawing module for the T0 detector                   //

diff --git a/EVE/EveDet/AliEveTPCLoaderEditor.cxx b/EVE/EveDet/AliEveTPCLoaderEditor.cxx
index 7d6388d..fc10e78 100644 (file)
--- a/EVE/EveDet/AliEveTPCLoaderEditor.cxx
+++ b/EVE/EveDet/AliEveTPCLoaderEditor.cxx
@@ -82,7 +82,7 @@ AliEveTPCLoaderEditor::AliEveTPCLoaderEditor(const TGWindow *p,
     AddFrame(f);
   }
 
-  fEvent = new TEveGValuator(this, "AliEveEventManager:", 110, 0);
+  fEvent = new TEveGValuator(this, "Event:", 110, 0);
   fEvent->SetShowSlider(kFALSE);
   fEvent->SetLabelWidth(labelW);
   fEvent->SetNELength(6);
@@ -91,7 +91,7 @@ AliEveTPCLoaderEditor::AliEveTPCLoaderEditor(const TGWindow *p,
   fEvent->SetToolTip("Current event number");
   fEvent->Connect("ValueSet(Double_t)",
                  "AliEveTPCLoaderEditor", this, "DoEvent()");
-  // Reuse AliEveEventManager for DoubleSR button
+  // Reuse Event for DoubleSR button
   fDoubleSR = new TGCheckButton(fEvent, "Double SR");
   fDoubleSR->SetToolTipText("Double sampling rate");
   fEvent->AddFrame(fDoubleSR, new TGLayoutHints(kLHintsLeft, 12, 0, 2, 0));

diff --git a/EVE/EveDet/AliEveTRDLoader.cxx b/EVE/EveDet/AliEveTRDLoader.cxx
index 7eab750..f6d2f52 100644 (file)
--- a/EVE/EveDet/AliEveTRDLoader.cxx
+++ b/EVE/EveDet/AliEveTRDLoader.cxx
@@ -165,7 +165,7 @@ Bool_t AliEveTRDLoader::GoToEvent(int ev)
 
   TTree *t = 0x0;
   TFile *f = new TFile(Form("%s/%s", fDir.Data(), fFilename.Data()));
-  if(! f->cd(Form("AliEveEventManager%d", ev))){
+  if(! f->cd(Form("Event%d", ev))){
     AliError(Form("Couldn't find event %d in file \"%s/%s\".", ev, fDir.Data(), fFilename.Data()));
     f->Close(); delete f;
     return kFALSE;
@@ -369,7 +369,7 @@ AliEveTRDLoaderEditor::AliEveTRDLoaderEditor(const TGWindow* p, Int_t width, Int
   AddFrame(f);
 
 
-  fEvent = new TEveGValuator(this, "AliEveEventManager:", 110, 0);
+  fEvent = new TEveGValuator(this, "Event:", 110, 0);
   fEvent->SetShowSlider(kFALSE);
   fEvent->SetLabelWidth(labelW);
   fEvent->SetNELength(6);

diff --git a/EVE/EveHLT/AliEveHOMERManager.cxx b/EVE/EveHLT/AliEveHOMERManager.cxx
index 0d5f030..4c81786 100644 (file)
--- a/EVE/EveHLT/AliEveHOMERManager.cxx
+++ b/EVE/EveHLT/AliEveHOMERManager.cxx
@@ -668,7 +668,7 @@ void AliEveHOMERManager::CreateReadoutList( const char** sourceHostnames, UShort
 
 /*
  * ---------------------------------------------------------------------------------
- *                            AliEveEventManager Handling
+ *                            Event Handling
  * ---------------------------------------------------------------------------------
  */
 
@@ -722,7 +722,7 @@ Int_t AliEveHOMERManager::NextEvent(){
   fEventID = (ULong64_t) fReader->GetEventID();
   fCurrentBlk = 0;
 
-  AliInfo( Form("AliEveEventManager 0x%016LX (%Lu) with %lu blocks", fEventID, fEventID, fNBlks) );
+  AliInfo( Form("Event 0x%016LX (%Lu) with %lu blocks", fEventID, fEventID, fNBlks) );
 
 #if 1
 

diff --git a/EVE/EveHLT/AliEveHOMERManager.h b/EVE/EveHLT/AliEveHOMERManager.h
index 54827fb..8792c58 100644 (file)
--- a/EVE/EveHLT/AliEveHOMERManager.h
+++ b/EVE/EveHLT/AliEveHOMERManager.h
@@ -107,11 +107,11 @@ public:
 
   /*
    * ---------------------------------------------------------------------------------
-   *                            AliEveEventManager Handling - public
+   *                            Event Handling - public
    * ---------------------------------------------------------------------------------
    */
 
-  /** Loads the next AliEveEventManager, after being connected
+  /** Loads the next Event, after being connected
    * @return            0 on sucess, "HOMER" errors on error
    */
   Int_t NextEvent();

diff --git a/EVE/alice-macros/MUON_trigger_info.C b/EVE/alice-macros/MUON_trigger_info.C
index 5a5ce30..2f4698c 100644 (file)
--- a/EVE/alice-macros/MUON_trigger_info.C
+++ b/EVE/alice-macros/MUON_trigger_info.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 #include <iomanip.h>
 
 void MUON_trigger_info(Int_t label) {

diff --git a/EVE/alice-macros/NLT_test.C b/EVE/alice-macros/NLT_test.C
index dae8f9f..e2e1766 100644 (file)
--- a/EVE/alice-macros/NLT_test.C
+++ b/EVE/alice-macros/NLT_test.C
@@ -9,7 +9,7 @@
 
 TEveProjectionManager* NLT_test(TEveElement* top=0)
 {
-  TEveScene* s = gEve->SpawnNewScene("Projected AliEveEventManager");
+  TEveScene* s = gEve->SpawnNewScene("Projected Event");
   gEve->GetDefViewer()->AddScene(s);
 
   TGLViewer* v = (TGLViewer *)gEve->GetGLViewer();

diff --git a/EVE/alice-macros/acorde_hits.C b/EVE/alice-macros/acorde_hits.C
index 5c32f86..95b320e 100644 (file)
--- a/EVE/alice-macros/acorde_hits.C
+++ b/EVE/alice-macros/acorde_hits.C
@@ -8,9 +8,9 @@
  **************************************************************************/
 
 TEvePointSet*
-acorde_hits(const char *varexp    = "ACORDE.fX:ACORDE.fY:ACORDE.fZ",
-        const char *selection = "",
-         TEveElement* cont = 0)
+acorde_hits(const char  *varexp    = "ACORDE.fX:ACORDE.fY:ACORDE.fZ",
+           const char  *selection = "",
+           TEveElement *cont      = 0)
 {
   AliRunLoader* rl =  AliEveEventManager::AssertRunLoader();
   rl->LoadHits("ACORDE");

diff --git a/EVE/alice-macros/emcal_digits.C b/EVE/alice-macros/emcal_digits.C
index 5cdc83c..b89694a 100644 (file)
--- a/EVE/alice-macros/emcal_digits.C
+++ b/EVE/alice-macros/emcal_digits.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 void emcal_digits()
 {
   AliRunLoader* rl =  AliEveEventManager::AssertRunLoader();

diff --git a/EVE/alice-macros/esd_Cascade.C b/EVE/alice-macros/esd_Cascade.C
index 90baf98..58ba4bb 100644 (file)
--- a/EVE/alice-macros/esd_Cascade.C
+++ b/EVE/alice-macros/esd_Cascade.C
@@ -7,15 +7,6 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-// #include "AliEveEventManager.h"
-// #include "TEveManager.h"
-// #include "AliEveCascade.h"
-
-// #include "AliESD.h"
-// #include "AliESDtrack.h"
-// #include "AliESDcascade.h"
-// #include "AliESDVertex.h"
-
 AliEveCascade* esd_make_cas(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx,
                            AliESDcascade* cas, AliESDtrack* neg, AliESDtrack* pos,
                            AliESDtrack* bach,Int_t i) {
@@ -58,8 +49,6 @@ AliEveCascade* esd_make_cas(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx
 }
 
 
-
-
 CascadeList* esd_AliEveCascade(Double_t min_pt=0.1, Double_t max_pt=100)
 {
   printf("THIS SCRIPT DOES NOT WORK.\n"

diff --git a/EVE/alice-macros/event_goto.C b/EVE/alice-macros/event_goto.C
index 98ba53b..6116281 100644 (file)
--- a/EVE/alice-macros/event_goto.C
+++ b/EVE/alice-macros/event_goto.C
@@ -6,10 +6,11 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 void event_goto(Int_t event=0)
 {
-  if(gEvent == 0) {
-    printf("AliEveEventManager not set!\n");
+  if (gEvent == 0) {
+    printf("AliEveEventManager is not initialized!\n");
     return;
   }
   gEvent->GotoEvent(event);

diff --git a/EVE/alice-macros/event_next.C b/EVE/alice-macros/event_next.C
index fa02e49..d25936e 100644 (file)
--- a/EVE/alice-macros/event_next.C
+++ b/EVE/alice-macros/event_next.C
@@ -6,10 +6,11 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 void event_next()
 {
-  if(gEvent == 0) {
-    printf("AliEveEventManager not set!\n");
+  if (gEvent == 0) {
+    printf("AliEveEventManager is not initialized!\n");
     return;
   }
   gEvent->NextEvent();

diff --git a/EVE/alice-macros/event_prev.C b/EVE/alice-macros/event_prev.C
index b53d558..1775f57 100644 (file)
--- a/EVE/alice-macros/event_prev.C
+++ b/EVE/alice-macros/event_prev.C
@@ -6,10 +6,11 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 void event_prev()
 {
-  if(gEvent == 0) {
-    printf("AliEveEventManager not set!\n");
+  if (gEvent == 0) {
+    printf("AliEveEventManager is not initialized!\n");
     return;
   }
   gEvent->PrevEvent();

diff --git a/EVE/alice-macros/jetplane.C b/EVE/alice-macros/jetplane.C
index e24e345..0cf582e 100644 (file)
--- a/EVE/alice-macros/jetplane.C
+++ b/EVE/alice-macros/jetplane.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 AliEveJetPlane* jetplane(Int_t iev)
 {
   TFile* f       = new TFile("aod.root");
@@ -20,7 +21,7 @@ AliEveJetPlane* jetplane(Int_t iev)
 
   TClonesArray* jets = aod->GetJets();
   Int_t njets = jets->GetEntries();
-  printf("AliEveEventManager: %5d Number of jets: %5d \n", iev, njets);
+  printf("Event: %5d Number of jets: %5d \n", iev, njets);
 
   for (Int_t ij = 0; ij < njets; ij++)
   {
@@ -32,7 +33,7 @@ AliEveJetPlane* jetplane(Int_t iev)
 
   TClonesArray* tracks = aod->GetTracks();
   Int_t ntracks = tracks->GetEntries();
-  printf("AliEveEventManager: %5d Number of tracks: %5d \n", iev, ntracks);
+  printf("Event: %5d Number of tracks: %5d \n", iev, ntracks);
 
   for (Int_t ij = 0; ij < ntracks; ij++)
   {

diff --git a/EVE/alice-macros/kine_tracks.C b/EVE/alice-macros/kine_tracks.C
index 190f8dd..010e1f5 100644 (file)
--- a/EVE/alice-macros/kine_tracks.C
+++ b/EVE/alice-macros/kine_tracks.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 // Import tracks from kinematics-tree / particle-stack.
 // Preliminary/minimal solution.
 

diff --git a/EVE/alice-macros/pmd_digits.C b/EVE/alice-macros/pmd_digits.C
index cf33d7b..ed24c88 100644 (file)
--- a/EVE/alice-macros/pmd_digits.C
+++ b/EVE/alice-macros/pmd_digits.C
@@ -6,7 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
-// ---------------------------------------------------------------------- //
+
 void pmd_digits(Int_t mode = 0)
 {
   Bool_t drawBackPolygons = kFALSE;

diff --git a/EVE/alice-macros/primary_vertex_tracks.C b/EVE/alice-macros/primary_vertex_tracks.C
index e0b048e..2905e30 100644 (file)
--- a/EVE/alice-macros/primary_vertex_tracks.C
+++ b/EVE/alice-macros/primary_vertex_tracks.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 TEveTrackList* primary_vertex_tracks()
 {
   TEveUtil::LoadMacro("esd_tracks.C");

diff --git a/EVE/alice-macros/print_kine_from_label.C b/EVE/alice-macros/print_kine_from_label.C
index d185664..e9ea141 100644 (file)
--- a/EVE/alice-macros/print_kine_from_label.C
+++ b/EVE/alice-macros/print_kine_from_label.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 void print_kine_from_label(Int_t label)
 {
   AliRunLoader* rl = AliEveEventManager::AssertRunLoader();

diff --git a/EVE/alice-macros/t0_digits.C b/EVE/alice-macros/t0_digits.C
index 46a197d..ebeab92 100644 (file)
--- a/EVE/alice-macros/t0_digits.C
+++ b/EVE/alice-macros/t0_digits.C
@@ -7,8 +7,6 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-class AliEveEventManager;
-
 void t0_digits()
 {
   AliRunLoader* rl =  AliEveEventManager::AssertRunLoader();

diff --git a/EVE/alice-macros/t0_raw.C b/EVE/alice-macros/t0_raw.C
index 8369ee2..5db2a41 100644 (file)
--- a/EVE/alice-macros/t0_raw.C
+++ b/EVE/alice-macros/t0_raw.C
@@ -7,8 +7,6 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-class AliEveEventManager;
-
 void t0_raw()
 {
   AliRunLoader* rl =  AliEveEventManager::AssertRunLoader();

diff --git a/EVE/alice-macros/tof_digits.C b/EVE/alice-macros/tof_digits.C
index f161345..faa516a 100644 (file)
--- a/EVE/alice-macros/tof_digits.C
+++ b/EVE/alice-macros/tof_digits.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 void tof_digits()
 {
   TClonesArray *array = 0x0;

diff --git a/EVE/alice-macros/tof_digits_sector.C b/EVE/alice-macros/tof_digits_sector.C
index 4da6fc8..4481bc4 100644 (file)
--- a/EVE/alice-macros/tof_digits_sector.C
+++ b/EVE/alice-macros/tof_digits_sector.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 void tof_digits_sector(Int_t sector=0)
 {
   Int_t nDigitsInVolume[3] = {-1, -1, -1};

diff --git a/EVE/alice-macros/tof_digits_strips.C b/EVE/alice-macros/tof_digits_strips.C
index e3fe02f..e65f805 100644 (file)
--- a/EVE/alice-macros/tof_digits_strips.C
+++ b/EVE/alice-macros/tof_digits_strips.C
@@ -6,6 +6,7 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
+
 void tof_digits_strips()
 {
   TClonesArray *array = 0x0;

diff --git a/EVE/alice-macros/tpc_hits.C b/EVE/alice-macros/tpc_hits.C
index 1b76ac8..6f48988 100644 (file)
--- a/EVE/alice-macros/tpc_hits.C
+++ b/EVE/alice-macros/tpc_hits.C
@@ -8,9 +8,9 @@
  **************************************************************************/
 
 TEvePointSet*
-tpc_hits(const char *varexp    = "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ",
-        const char *selection = "TPC2.fArray.fR>80",
-         TEveElement* cont = 0)
+tpc_hits(const char  *varexp    = "TPC2.fArray.fR:TPC2.fArray.fFi:TPC2.fArray.fZ",
+        const char  *selection = "TPC2.fArray.fR>80",
+         TEveElement *cont      = 0)
 {
   // Extracts 'major' TPC hits (not the compressed ones).
   // This gives ~2.5% of all hits.

diff --git a/EVE/alice-macros/vzero_digits.C b/EVE/alice-macros/vzero_digits.C
index 69829d2..5f516d3 100644 (file)
--- a/EVE/alice-macros/vzero_digits.C
+++ b/EVE/alice-macros/vzero_digits.C
@@ -6,17 +6,18 @@
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
  * full copyright notice.                                                 *
  **************************************************************************/
-//   fV0CHeight1         =    2.5; // height of cell 1
-//   fV0CHeight2         =    4.4; // height of cell 2
-//   fV0CHeight3         =    7.4; // height of cell 3
-//   fV0CHeight4         =   12.5; // height of cell 4
-//   fV0CRMin            =    4.6; // inner radius of box
-
-//   fV0AR0     =  4.2;  // Radius of hole
-//   fV0AR1     =  7.6;  // Maximun radius of 1st cell
-//   fV0AR2     = 13.8; // Maximun radius of 2nd cell
-//   fV0AR3     = 22.7; // Maximun radius of 3rd cell
-//   fV0AR4     = 41.3; // Maximun radius of 4th cell
+
+//   fV0CHeight1  =  2.5; // height of cell 1
+//   fV0CHeight2  =  4.4; // height of cell 2
+//   fV0CHeight3  =  7.4; // height of cell 3
+//   fV0CHeight4  = 12.5; // height of cell 4
+//   fV0CRMin     =  4.6; // inner radius of box
+//
+//   fV0AR0       =  4.2; // Radius of hole
+//   fV0AR1       =  7.6; // Maximun radius of 1st cell
+//   fV0AR2       = 13.8; // Maximun radius of 2nd cell
+//   fV0AR3       = 22.7; // Maximun radius of 3rd cell
+//   fV0AR4       = 41.3; // Maximun radius of 4th cell
 
 void vzero_digits()
 {

diff --git a/EVE/macros/alieve_init.C b/EVE/macros/alieve_init.C
index 7c6dadf..48f5018 100644 (file)
--- a/EVE/macros/alieve_init.C
+++ b/EVE/macros/alieve_init.C
@@ -12,6 +12,10 @@
 #include <string>
 #endif
 
+// !!!!! Need initialization that will also work for raw.
+// Path and event-id are usually not needed.
+// const Text_t* raw_file = 0,
+
 void alieve_init(const Text_t* path   = ".", Int_t event=0,
                 const Text_t* cdburi = 0,
                 Bool_t assert_runloader=kFALSE, Bool_t assert_esd=kFALSE)