26-nov-2004 NvE Printout of UniqueID added in AliSignal::Data() and AliEvent::ShowDev...

                addressing specific signals or devices during data analysis.
                Memberfunction GetIdHit introduced in AliDevice and AliEvent and AliJet::GetIdTrack
                optimised for speed.
                Memberfunction GetIdDevice introduced in AliEvent.

diff --git a/RALICE/AliDevice.cxx b/RALICE/AliDevice.cxx
index 24e28d5e2e995f48a140cbbe7206ebd8ce996c15..3e877554a6e7386139219e60e8b0dcd89caef6cf 100644 (file)
--- a/RALICE/AliDevice.cxx
+++ b/RALICE/AliDevice.cxx
@@ -312,6 +312,25 @@ AliSignal* AliDevice::GetHit(Int_t j) const
  }
 }
 ///////////////////////////////////////////////////////////////////////////
+AliSignal* AliDevice::GetIdHit(Int_t id) const
+{
+// Return the hit with unique identifier "id".
+ if (!fHits || id<0) return 0;
+
+ AliSignal* sx=0;
+ Int_t sid=0;
+ for (Int_t i=0; i<GetNhits(); i++)
+ {
+  sx=(AliSignal*)fHits->At(i);
+  if (sx)
+  {
+   sid=sx->GetUniqueID();
+   if (id==sid) return sx;
+  }
+ }
+ return 0; // No matching id found
+}
+///////////////////////////////////////////////////////////////////////////
 TObjArray* AliDevice::GetHits()
 {
 // Provide the references to all the registered hits.

diff --git a/RALICE/AliDevice.h b/RALICE/AliDevice.h
index ee068829126c5ae9ab017e70ebca5cf8196ae9b9..fe0378a9fa88ab7b0dca16bc3a67d79ae610d9f6 100644 (file)
--- a/RALICE/AliDevice.h
+++ b/RALICE/AliDevice.h
@@ -25,6 +25,7 @@ class AliDevice : public AliSignal
   void RemoveHits();                                 // Remove all AliSignals as hits from this module
   Int_t GetNhits() const;                            // Provide number of registered hits
   AliSignal* GetHit(Int_t j) const;                  // Access to the AliSignal registered as hit number j
+  AliSignal* GetIdHit(Int_t id) const;               // Provide the hit with unique identifier "id"
   TObjArray* GetHits();                              // Provide the references to all the registered hits
   virtual void Reset(Int_t mode=0);                  // Reset registered hits and AliSignal attributes
   void ShowHit(Int_t j=0) const;                     // Show data of the j-th hit (j=0 means all hits)
@@ -42,6 +43,6 @@ class AliDevice : public AliSignal
   TObjArray* fOrdered; //! Temp. array to hold the ordered hits
   TObjArray* fMarkers; //! Temp. array to hold the 3D markers for the hit display
 
- ClassDef(AliDevice,4) // Signal (Hit) handling of a generic device.
+ ClassDef(AliDevice,5) // Signal (Hit) handling of a generic device.
 };
 #endif

diff --git a/RALICE/AliEvent.cxx b/RALICE/AliEvent.cxx
index 652ff126a6fb23925c5d7c5fe960c4bc546a356f..6b2c807c44d972baa5b1861008b68926a4a88823 100644 (file)
--- a/RALICE/AliEvent.cxx
+++ b/RALICE/AliEvent.cxx
@@ -13,7 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-// $Id: AliEvent.cxx,v 1.24 2004/07/06 13:34:16 nick Exp $
+// $Id: AliEvent.cxx,v 1.25 2004/10/20 10:49:44 nick Exp $
 
 ///////////////////////////////////////////////////////////////////////////
 // Class AliEvent
@@ -244,7 +244,7 @@
 // Note : All quantities are in GeV, GeV/c or GeV/c**2
 //
 //--- Author: Nick van Eijndhoven 27-may-2001 UU-SAP Utrecht
-//- Modified: NvE $Date: 2004/07/06 13:34:16 $ UU-SAP Utrecht
+//- Modified: NvE $Date: 2004/10/20 10:49:44 $ UU-SAP Utrecht
 ///////////////////////////////////////////////////////////////////////////
 
 #include "AliEvent.h"
@@ -731,6 +731,24 @@ TObject* AliEvent::GetDevice(TString name) const
  }
 }
 ///////////////////////////////////////////////////////////////////////////
+TObject* AliEvent::GetIdDevice(Int_t id) const
+{
+// Return the device with unique identifier "id".
+ if (!fDevices || id<0) return 0;
+
+ Int_t idx=0;
+ for (Int_t i=0; i<GetNdevices(); i++)
+ {
+  TObject* dev=fDevices->At(i);
+  if (dev)
+  {
+   idx=dev->GetUniqueID();
+   if (idx==id) return dev;
+  }
+ }
+ return 0; // No matching id found
+}
+///////////////////////////////////////////////////////////////////////////
 void AliEvent::ShowDevices() const
 {
 // Provide an overview of the available devices.
@@ -745,7 +763,7 @@ void AliEvent::ShowDevices() const
    {
     const char* name=dev->GetName();
     cout << " Device number : " << i;
-    cout << " Class : " << dev->ClassName();
+    cout << " Class : " << dev->ClassName() << " Id : " << dev->GetUniqueID();
     if (strlen(name)) cout << " Name : " << name;
     if (dev->InheritsFrom("AliDevice")) cout << " Nhits : " << ((AliDevice*)dev)->GetNhits();
     cout << endl;
@@ -783,6 +801,28 @@ TObjArray* AliEvent::GetHits(const char* classname)
  return fHits;
 }
 ///////////////////////////////////////////////////////////////////////////
+AliSignal* AliEvent::GetIdHit(Int_t id,const char* classname)
+{
+// Return the hit with unique identifier "id" for the specified device class.
+ if (id<0) return 0;
+
+ Int_t nhits=GetNhits(classname);
+ if (!nhits) return 0;
+
+ AliSignal* sx=0;
+ Int_t sid=0;
+ for (Int_t i=0; i<nhits; i++)
+ {
+  sx=(AliSignal*)fHits->At(i);
+  if (sx)
+  {
+   sid=sx->GetUniqueID();
+   if (id==sid) return sx;
+  }
+ }
+ return 0; // No matching id found
+}
+///////////////////////////////////////////////////////////////////////////
 void AliEvent::LoadHits(const char* classname)
 {
 // Load the references to the various hits registered to the specified

diff --git a/RALICE/AliEvent.h b/RALICE/AliEvent.h
index 68875c5b9c3a6272a49166f85b39584fd4e3bd0f..9ca6c657e71c078b1ceb94078a69b49177de3122 100644 (file)
--- a/RALICE/AliEvent.h
+++ b/RALICE/AliEvent.h
@@ -3,7 +3,7 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-// $Id: AliEvent.h,v 1.18 2004/07/06 13:34:17 nick Exp $
+// $Id: AliEvent.h,v 1.19 2004/10/20 10:49:44 nick Exp $
 
 #include <math.h>
  
@@ -51,9 +51,11 @@ class AliEvent : public AliVertex
   Int_t GetNdevices() const;              // Provide the number of devices
   void ShowDevices() const;               // Provide on overview of the available devices
   TObject* GetDevice(Int_t i) const;      // Provide i-th device of the event
-  TObject* GetDevice(TString name) const; // Provide device with name "name"
+  TObject* GetDevice(TString name) const; // Provide the device with name "name"
+  TObject* GetIdDevice(Int_t id) const;   // Provide the device with unique identifier "id"
   Int_t GetNhits(const char* classname);  // Provide number of hits for the specified device class
   TObjArray* GetHits(const char* classname); // Provide refs to all hits of the specified device class 
+  AliSignal* GetIdHit(Int_t id,const char* classname); // Provide hit with unique "id" for the specified device class
   TObjArray* SortHits(const char* classname,TString name,Int_t mode=-1); // Sort hits by named signal value
   TObjArray* SortHits(const char* classname,Int_t idx=1,Int_t mode=-1);  // Sort hits by indexed signal value
   void GetExtremes(const char* classname,Float_t& vmin,Float_t& vmax,Int_t idx=1); // Get min. and max. signal value
@@ -84,6 +86,6 @@ class AliEvent : public AliVertex
   TObjArray* fOrdered;                  //! Temp. array to hold references to various ordered objects
   TObject* fDisplay;                    //! Temp. pointer to hold objects which serve event displays
 
- ClassDef(AliEvent,16) // Creation and investigation of an Alice physics event.
+ ClassDef(AliEvent,17) // Creation and investigation of an Alice physics event.
 };
 #endif

diff --git a/RALICE/AliJet.cxx b/RALICE/AliJet.cxx
index abb48bdfb5421c7a57e981895af08b99f2315163..95195241a2481157903183d5af859a10044566ac 100644 (file)
--- a/RALICE/AliJet.cxx
+++ b/RALICE/AliJet.cxx
@@ -426,22 +426,15 @@ AliTrack* AliJet::GetTrack(Int_t i) const
 AliTrack* AliJet::GetIdTrack(Int_t id) const
 {
 // Return the track with user identifier "id" of this jet
+ if (!fTracks) return 0;
+
  AliTrack* tx=0;
- AliTrack* t=0;
- if (!fTracks)
- {
-  cout << " *AliJet*::GetIdTrack* No tracks present." << endl;
-  return 0;
- }
- else
+ for (Int_t i=0; i<fNtrk; i++)
  {
-  for (Int_t i=0; i<fNtrk; i++)
-  {
-   tx=(AliTrack*)fTracks->At(i);
-   if (id == tx->GetId()) t=tx;
-  }
-  return t;
+  tx=(AliTrack*)fTracks->At(i);
+  if (id == tx->GetId()) return tx;
  }
+ return 0; // No matching id found
 }
 ///////////////////////////////////////////////////////////////////////////
 Double_t AliJet::GetPt()

diff --git a/RALICE/AliSignal.cxx b/RALICE/AliSignal.cxx
index 6a4bd982d6fb8f7228a7b18203f447699a1c9259..02287a49e73755597a34891747ae5495f33c5501 100644 (file)
--- a/RALICE/AliSignal.cxx
+++ b/RALICE/AliSignal.cxx
@@ -195,6 +195,9 @@ void AliSignal::Reset(Int_t mode)
 // The default when invoking Reset() corresponds to mode=0.
 //
 // Note : In all cases the storage of the various links will be reset.
+//        The UniqueID, name and title will NOT be reset.
+//        In case the user wants to reset these attributes, this has to
+//        be done explicitly via the SET facilities. 
 //
 // The usage of mode=0 allows to re-use the allocated memory for new
 // signal (and error) values. This behaviour is preferable (i.e. faster)
@@ -546,7 +549,7 @@ void AliSignal::Data(TString f) const
  const char* name=GetName();
  const char* title=GetTitle();
 
- cout << " *" << ClassName() << "::Data*";
+ cout << " *" << ClassName() << "::Data* Id :" << GetUniqueID();
  if (strlen(name))  cout << " Name : " << name;
  if (strlen(title)) cout << " Title : " << title;
  cout << endl;

diff --git a/RALICE/history.txt b/RALICE/history.txt
index b56607b0ad5055a2e8f6ba67a9d6c1f8a1b21829..0989794b7c0c4e94f6459a67d438f9753c4b549f 100644 (file)
--- a/RALICE/history.txt
+++ b/RALICE/history.txt
@@ -538,3 +538,8 @@
 13-oct-2004 NvE Hit investigation facilities extended in AliDevice and AliEvent.
 15-oct-2004 NvE Optimisation of MC parameters for nucleus-nucleus and astrophysics processes introduced
                 in AliCollider. Also facilities added to provide full user control.
+26-nov-2004 NvE Printout of UniqueID added in AliSignal::Data() and AliEvent::ShowDevices() in view of
+                addressing specific signals or devices during data analysis.
+                Memberfunction GetIdHit introduced in AliDevice and AliEvent and AliJet::GetIdTrack
+                optimised for speed.
+                Memberfunction GetIdDevice introduced in AliEvent.