(Haavard)

 AliDCSSensor:
  New MakeGraph and Eval methods. New fEndTime field.
 AliDCSSensorArray:
  Set end time to each sensor in array. fFirstSensor and fLastSensor
 removed

diff --git a/STEER/AliDCSSensor.cxx b/STEER/AliDCSSensor.cxx
index 7f51c247173a279e305e13921288b9fccb8bd4be..bf194802968f656b12aa68aa25e7ad11ac0033b1 100644 (file)
--- a/STEER/AliDCSSensor.cxx
+++ b/STEER/AliDCSSensor.cxx
@@ -36,13 +36,19 @@
 
 
 #include "AliDCSSensor.h"
-ClassImp(AliDCSSensor)
+ClassImp(AliDCSSensor);
+
+const Double_t kSmall = -9e99;     // invalid small value
+const Double_t kLarge = 9e99;      // invalid large value
+const Double_t kSecInHour = 3600.; // seconds in one hour
+
 
 
 AliDCSSensor::AliDCSSensor():
   fId(),
   fIdDCS(0),
   fStartTime(0),
+  fEndTime(0),
   fGraph(0),
   fFit(0),
   fX(0),
@@ -59,6 +65,7 @@ AliDCSSensor::AliDCSSensor(const AliDCSSensor& source) :
    fId(source.fId),
    fIdDCS(source.fIdDCS),
    fStartTime(source.fStartTime),
+   fEndTime(source.fEndTime),
    fGraph(source.fGraph),
    fFit(source.fFit),
    fX(source.fX),
@@ -86,8 +93,12 @@ Double_t AliDCSSensor::GetValue(UInt_t timeSec)
  // Get temperature value for actual sensor
  //  timeSec given as offset from start-of-run measured in seconds
  //
- Double_t timeHrs = timeSec/3600.0;
- return  fFit->Eval(timeHrs,0);
+ Double_t timeHrs = timeSec/kSecInHour;
+ if (fFit) {
+  return  fFit->Eval(timeHrs,0);
+ } else { 
+  return kSmall;
+ }
 }
 //_____________________________________________________________________________
 Double_t AliDCSSensor::GetValue(TTimeStamp time) 
@@ -95,8 +106,63 @@ Double_t AliDCSSensor::GetValue(TTimeStamp time)
  // Get temperature value for actual sensor
  //  time given as absolute TTimeStamp
  //
- Double_t timeHrs = (time.GetSec() - fStartTime)/3600.0;
- return fFit->Eval(timeHrs,0);
+ Double_t timeHrs = (time.GetSec() - fStartTime)/kSecInHour;
+ if (fFit) {
+  return  fFit->Eval(timeHrs,0);
+ } else { 
+  return kSmall;
+ }
+}
+
+//_____________________________________________________________________________
+
+Double_t AliDCSSensor::Eval(const TTimeStamp& time) const
+{
+  // 
+  // Return temperature at given time
+  //  If time < start of map  return kSmall
+  //  If time > end of map    return kLarge
+  
+  UInt_t timeSec = time.GetSec();
+  UInt_t diff = timeSec-fStartTime;
+  
+  if ( timeSec < fStartTime ) return kSmall;
+  if ( timeSec > fEndTime ) return kLarge;
+ 
+  Double_t timeHour = diff/kSecInHour;
+  if ( fFit ) {
+     return fFit->Eval(timeHour); 
+  } else {
+     return kSmall;
+  }
+}
+
+TGraph* AliDCSSensor::MakeGraph(Int_t nPoints) const
+{
+  //
+  // Make graph from start time to end time of DCS values 
+  //
+
+  UInt_t stepTime = (fEndTime-fStartTime)/nPoints;
+  
+  if ( !fFit ) return 0;
+
+  Double_t *x = new Double_t[nPoints+1];
+  Double_t *y = new Double_t[nPoints+1];
+  for (Int_t ip=0; ip<nPoints; ip++) {
+    x[ip] = fStartTime+ip*stepTime;
+    y[ip] = fFit->Eval(ip*stepTime/kSecInHour);
+  }
+  
+  TGraph *graph = new TGraph(nPoints,x,y);
+  delete [] x;
+  delete [] y;
+  
+  graph->GetXaxis()->SetTimeDisplay(1);
+  graph->GetXaxis()->SetLabelOffset(0.02);
+  graph->GetXaxis()->SetTimeFormat("#splitline{%d/%m}{%H:%M}");
+  
+  return graph;
 }
 
 

diff --git a/STEER/AliDCSSensor.h b/STEER/AliDCSSensor.h
index 331084393f5f90b9d8151fad8958732e5cc47a6c..072e6750d4b01cf6eacf73a7ff249e7ccb446ea2 100644 (file)
--- a/STEER/AliDCSSensor.h
+++ b/STEER/AliDCSSensor.h
@@ -45,7 +45,8 @@ public:
   Double_t    GetR()              const {return TMath::Sqrt(fX*fX+fY*fY);}
   Double_t    GetPhi()            const {return TMath::ATan2(fY,fX);    }
   
-  UInt_t      GetStartTime() const {return fStartTime;}
+  UInt_t      GetStartTime() const {return fStartTime;} 
+  UInt_t      GetEndTime() const { return fEndTime; }
   TGraph*     GetGraph()   const {return fGraph; }
   AliSplineFit* GetFit()   const {return fFit; }
 
@@ -60,8 +61,14 @@ public:
   void SetFit     (AliSplineFit *f) {fFit = f; }
   void SetStartTime (UInt_t stime)  {fStartTime = stime; }
   void SetStartTime (TTimeStamp time)  {fStartTime = time.GetSec(); }
+  void SetEndTime (UInt_t stime)  {fEndTime = stime; }
+  void SetEndTime (TTimeStamp time)  {fEndTime = time.GetSec(); }
   Double_t GetValue(UInt_t timeSec);
   Double_t GetValue(TTimeStamp time);
+  Double_t Eval(const TTimeStamp& time) const;
+  TGraph *MakeGraph (Int_t nPoints=100) const;
+  
+  
 //  static TClonesArray * ReadList(const char *fname);
 //  static TClonesArray * ReadListInd(const char *fname,
 //                                 Int_t& firstSensor, Int_t& lastSensor);
@@ -69,13 +76,14 @@ public:
 protected:
   Int_t fId;        // Internal number of sensor id  (array index)
   Int_t fIdDCS;     // ID number in DCS
-  UInt_t   fStartTime;  // starting time
+  UInt_t   fStartTime;  // start time for DCS map/fit
+  UInt_t   fEndTime;    // end time for DCS map/fit
   TGraph * fGraph;      // graph with values
   AliSplineFit *fFit;   // fit to graph values
   Double_t fX;      //X-position of the sensor
   Double_t fY;      //Y-position of the sensor
   Double_t fZ;      //Z-position of the sensor
 
-  ClassDef(AliDCSSensor,1);
+  ClassDef(AliDCSSensor,2);
 };
 #endif

diff --git a/STEER/AliDCSSensorArray.cxx b/STEER/AliDCSSensorArray.cxx
index 808825b65500bb867145992a754c4e75a712d34a..591aca09362af3b95cb2af0f8535956b112e8e2d 100644 (file)
--- a/STEER/AliDCSSensorArray.cxx
+++ b/STEER/AliDCSSensorArray.cxx
@@ -30,11 +30,10 @@ const Int_t  kMinPoints = 10;      // minimum number of points per knot in fit
 const Int_t  kIter = 10;           // number of iterations for spline fit
 const Double_t  kMaxDelta = 0.00;  // precision parameter for spline fit
 const Int_t  kFitReq = 2;          // fit requirement, 2 = continuous 2nd derivative
+const Double_t kSecInHour = 3600.; // seconds in one hour
 
 //_____________________________________________________________________________
 AliDCSSensorArray::AliDCSSensorArray():TNamed(), 
-  fFirstSensor(0),
-  fLastSensor(0),
   fStartTime (2000,1,1,0,0,0),
   fEndTime   (2000,1,1,0,0,0),
   fSensors(0)
@@ -47,8 +46,6 @@ AliDCSSensorArray::AliDCSSensorArray():TNamed(),
 //_____________________________________________________________________________
 AliDCSSensorArray::AliDCSSensorArray(Int_t prevRun, const char* dbEntry) : 
   TNamed(),
-  fFirstSensor(0),
-  fLastSensor(0),
   fStartTime (2000,1,1,0,0,0),
   fEndTime   (2000,1,1,0,0,0),
   fSensors(0)
@@ -93,8 +90,6 @@ AliDCSSensorArray::AliDCSSensorArray(Int_t prevRun, const char* dbEntry) :
 
 //_____________________________________________________________________________
 AliDCSSensorArray::AliDCSSensorArray(const AliDCSSensorArray &c):TNamed(c),
-  fFirstSensor(c.fFirstSensor),
-  fLastSensor(c.fLastSensor),
   fStartTime (c.fStartTime),
   fEndTime   (c.fEndTime),
   fSensors(0)
@@ -157,7 +152,8 @@ void AliDCSSensorArray::SetGraph(TMap *map, const char *amandaString)
   } 
 }  
 //_____________________________________________________________________________
-void AliDCSSensorArray::MakeSplineFit(TMap *map, const char *amandaString) 
+void AliDCSSensorArray::MakeSplineFit(TMap *map, const char *amandaString,
+                                                               Bool_t keepMap) 
 {
   // 
   // Make spline fits from DCS maps 
@@ -174,8 +170,10 @@ void AliDCSSensorArray::MakeSplineFit(TMap *map, const char *amandaString)
     fit->InitKnots(gr,kMinPoints,kIter,kMaxDelta);
     fit->SplineFit(kFitReq);
     entry->SetStartTime(fStartTime);
+    entry->SetEndTime(fEndTime);
     fit->Cleanup();
     entry->SetFit(fit);
+    if (keepMap) entry->SetGraph(gr);
   } 
 }  
 
@@ -239,7 +237,7 @@ TGraph* AliDCSSensorArray::MakeGraph(TObjArray* valueSet){
     }                                          
     skipped=0;                                       
     if (val->GetTimeStamp()-time0>1000000) continue;
-    x[out] = (val->GetTimeStamp()-time0)/3600.0; // give times in fractions of hours 
+    x[out] = (val->GetTimeStamp()-time0)/kSecInHour; // give times in fractions of hours 
     y[out] = val->GetFloat();
     out++;
     
@@ -290,3 +288,36 @@ AliDCSSensor* AliDCSSensorArray::GetSensor(Double_t x, Double_t y, Double_t z)
     return 0;
  }
 }
+
+AliDCSSensor* AliDCSSensorArray::GetSensorNum(Int_t ind) 
+{
+ //
+ //  Return sensor given by array index
+ //
+ return (AliDCSSensor*)fSensors->At(ind);
+}
+
+Int_t AliDCSSensorArray::GetFirstIdDCS() const
+{
+ //
+ //  Return DCS Id of first sensor
+ //
+ if ( fSensors != 0 ) {
+    return ((AliDCSSensor*)fSensors->At(0))->GetIdDCS();
+ } else {
+    return 0;
+ }
+}
+
+Int_t AliDCSSensorArray::GetLastIdDCS() const 
+{
+ //
+ //  Return DCS Id of last sensor
+ //
+ if ( fSensors != 0 ) {
+    Int_t last = fSensors->GetEntries();
+    return ((AliDCSSensor*)fSensors->At(last-1))->GetIdDCS();
+ } else {
+    return 0;
+ }
+}

diff --git a/STEER/AliDCSSensorArray.h b/STEER/AliDCSSensorArray.h
index ef376bb6577789e749f431985b46f961f6fc549f..75302fe02f90ec35d4554bf7659c8f55865827cf 100644 (file)
--- a/STEER/AliDCSSensorArray.h
+++ b/STEER/AliDCSSensorArray.h
@@ -35,21 +35,24 @@ class AliDCSSensorArray : public TNamed {
   TTimeStamp GetStartTime () const { return fStartTime; } 
   TTimeStamp GetEndTime () const { return fEndTime; } 
   void SetGraph     (TMap *map, const char* amandaString);
-  void MakeSplineFit(TMap *map, const char* amandaString);
+  void MakeSplineFit(TMap *map, const char* amandaString, Bool_t keepMap=kFALSE);
   TMap* ExtractDCS  (TMap *dcsMap, const char* amandaString);
   TGraph* MakeGraph (TObjArray *valueSet);
   Double_t GetValue  (UInt_t timeSec, Int_t sensor);
   AliDCSSensor* GetSensor (Int_t IdDCS);
   AliDCSSensor* GetSensor (Double_t x, Double_t y, Double_t z);
+  AliDCSSensor* GetSensorNum (Int_t ind);
+  Int_t NumSensors() const { return fSensors->GetEntries(); }
+   
+  Int_t GetFirstIdDCS() const;
+  Int_t GetLastIdDCS()  const; 
 
  protected:
-  Int_t fFirstSensor;             // DCS ID of first sensor
-  Int_t fLastSensor;              // DCS ID of last sensor
   TTimeStamp  fStartTime;         // start time for measurements in this entry
   TTimeStamp  fEndTime;           // end time for measurements in this entry
   TClonesArray *fSensors;         // Array of sensors
 
-  ClassDef(AliDCSSensorArray,1)       //  TPC calibration class for parameters which are saved per pad
+  ClassDef(AliDCSSensorArray,2)       //  TPC calibration class for parameters which are saved per pad
 
 };