Removing warnings (Sun)

[u/mrichter/AliRoot.git] / RALICE / AliSignal.h

diff --git a/RALICE/AliSignal.h b/RALICE/AliSignal.h
index 678b3c0eed5a647cbce73700c6d35c428cf6244f..1a31863a2a8160a2d360cbb83bfacfb374c92394 100644 (file)
--- a/RALICE/AliSignal.h
+++ b/RALICE/AliSignal.h
@@ -8,40 +8,47 @@
 #include "TObject.h"
 #include "TArrayF.h"
 #include "TH1.h"
+#include "TObjArray.h"
 
 #include "AliPosition.h"
+#include "AliAttrib.h"
 
-class AliSignal : public TObject,public AliPosition
+class AliSignal : public TNamed,public AliPosition,public AliAttrib
 {
  public:
   AliSignal();                                          // Default constructor
   virtual ~AliSignal();                                 // Destructor
   AliSignal(AliSignal& s);                              // Copy constructor
+  virtual TObject* Clone(const char* name="");                // Make a deep copy and provide its pointer
   virtual void SetSignal(Double_t sig,Int_t j=1);       // Store j-th signal value
   virtual void AddSignal(Double_t sig,Int_t j=1);       // Add value to j-th signal value
-  virtual Float_t GetSignal(Int_t j=1);                 // Provide j-th signal value
+  virtual Float_t GetSignal(Int_t j=1,Int_t mode=0);    // Provide j-th (corrected) signal value
   virtual void SetSignalError(Double_t dsig,Int_t j=1); // Store error on j-th signal value
   virtual Float_t GetSignalError(Int_t j=1);            // Provide error j-th signal value
   virtual void ResetSignals(Int_t mode=0);              // User selected reset of signal values and/or errors
   virtual void DeleteSignals(Int_t mode=0);             // User selected delete of signal values and/or errors
-  virtual void ResetPosition();                         // Reset position and errors to 0
   virtual void Reset(Int_t mode=0);                     // Reset signal and position values and errors
-  void Data(TString f="car");                           // Print signal info for coord. frame f
-  void SetName(TString name);                           // Set the name tag to indicate the kind of signal
-  TString GetName();                                    // Provide the name tag indicating the kind of signal
+  virtual void Data(TString f="car");                   // Print all signal info for coord. frame f
+  virtual void List(Int_t j=0);                         // Print signal info for the j-th (or all) slot(s)
   Int_t GetNvalues();                                   // Provide the number of signal values
   Int_t GetNerrors();                                   // Provide the number of specified errors
-  TH1F* GetWaveform();                                  // Provide pointer of the waveform histogram
-  void SetWaveform(TH1F* waveform);                     // Set the waveform histogram
-  virtual AliSignal* MakeCopy(AliSignal& s);            // Make a deep copy and provide its pointer
-
+  Int_t GetNwaveforms();                                // Provide the number of specified waveforms
+  void SetWaveform(TH1F* waveform,Int_t j=1);           // Set the j-th waveform histogram
+  TH1F* GetWaveform(Int_t j=1);                         // Provide pointer of the j-th waveform histogram 
+  void ResetWaveform(Int_t j=1);                        // Reset the j-th waveform histogram 
+  void DeleteWaveform(Int_t j=1);                       // Delete the j-th waveform histogram 
+  Int_t GetNlinks();                                    // Provide the number of specified linked objects
+  void SetLink(TObject* obj,Int_t j=1);                 // Link object to the j-th slot
+  TObject* GetLink(Int_t j=1);                          // Provide pointer of the object linked to the j-th slot
+  void ResetLink(Int_t j=1);                            // Reset the link of the j-th slot
+  void ResetLink(TObject* obj);                         // Reset the link to the specified object in all slots
 
  protected:
-  TArrayF* fSignal;  // Signal values
-  TArrayF* fDsignal; // Errors on signal values
-  TString fName;     // Name tag to identify the kind of signal
-  TH1F* fHwaveform;  // The 1D histogram containing the waveform
+  TArrayF* fSignals;                           // Signal values
+  TArrayF* fDsignals;                          // Errors on signal values
+  TObjArray* fWaveforms;                       // The 1D histograms containing the signal waveforms
+  TObjArray* fLinks;                           // Pointers of objects related to the various slots
 
- ClassDef(AliSignal,7) // Generic handling of (extrapolated) detector signals.
+ ClassDef(AliSignal,9) // Generic handling of (extrapolated) detector signals.
 };
 #endif