X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=ZDC%2FAliZDCDataDCS.cxx;h=580aa20b93e3eadeb7d1dbddcfdf33ee41b51dc0;hp=02a8c7d635adde4ed38fa1f6f0a9db18505c8ef8;hb=7aad68fd483f75378bb6c6432eb41d16a91539da;hpb=5a8e8156aa0831ff58ca054364f5552dc8feab43

diff --git a/ZDC/AliZDCDataDCS.cxx b/ZDC/AliZDCDataDCS.cxx
index 02a8c7d635a..580aa20b93e 100644
--- a/ZDC/AliZDCDataDCS.cxx
+++ b/ZDC/AliZDCDataDCS.cxx
@@ -10,12 +10,12 @@
 #include "AliDCSValue.h"
 #include "AliLog.h"
 
-#include <TTimeStamp.h>
-#include <TObjString.h>
-#include <TGraph.h>
+#include <TCanvas.h>
 #include <TDatime.h>
+#include <TString.h>
+#include <TObjString.h>
 #include <TStyle.h>
-#include <TCanvas.h>
+#include <TTimeStamp.h>
 
 ClassImp(AliZDCDataDCS)
 
@@ -25,104 +25,202 @@ AliZDCDataDCS::AliZDCDataDCS():
    fRun(0),
    fStartTime(0),
    fEndTime(0),
-   fGraphs("TGraph",kNGraphs),
+   fStartTimeDCSQuery(0),
+   fEndTimeDCSQuery(0),
+//   fTimeStamp(0x0), 
+//   fHVData(0x0), 
    fIsProcessed(kFALSE)
 {
   // Default constructor
+  for(Int_t i=0; i<kNAliases; i++) fAliasNames[i] = "";
+  for(Int_t i=0; i<kNAlignDet; i++) fAlignData[i] = 0.;
 }
 
 //---------------------------------------------------------------
-AliZDCDataDCS::AliZDCDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime):
+AliZDCDataDCS::AliZDCDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime,
+			 UInt_t startTimeDCSQuery, UInt_t endTimeDCSQuery):
    TObject(),
    fRun(nRun),
    fStartTime(startTime),
    fEndTime(endTime),
-   fGraphs("TGraph",kNGraphs),
+   fStartTimeDCSQuery(startTimeDCSQuery),
+   fEndTimeDCSQuery(endTimeDCSQuery),
+//   fTimeStamp(0x0), 
+//   fHVData(0x0), 
    fIsProcessed(kFALSE)
 {
    // Standard constructor
    
-   AliInfo(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", nRun,
+   AliDebug(2,Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s \n\tStartTime DCS Query %s \n\tEndTime DCS Query %s", nRun,
    TTimeStamp(startTime).AsString(),
-   TTimeStamp(endTime).AsString()));
+   TTimeStamp(endTime).AsString(), 
+   TTimeStamp(startTimeDCSQuery).AsString(), 
+   TTimeStamp(endTimeDCSQuery).AsString()));
 
    Init();
 
 }
 
+//---------------------------------------------------------------
+AliZDCDataDCS::AliZDCDataDCS(const AliZDCDataDCS & data):
+  TObject(data), 
+  fRun(data.fRun),
+  fStartTime(data.fStartTime),
+  fEndTime(data.fEndTime),
+  fStartTimeDCSQuery(data.fStartTimeDCSQuery),
+  fEndTimeDCSQuery(data.fEndTimeDCSQuery),
+//  fTimeStamp(data.fTimeStamp), 
+//  fHVData(data.fHVData), 
+  fIsProcessed(data.fIsProcessed)
+{
+
+  // copy constructor
+
+  for(int i=0;i<kNAliases;i++) fAliasNames[i] = data.fAliasNames[i];
+  for(int i=0;i<kNAlignDet;i++) fAlignData[i] = data.fAlignData[i];
+    
+}
+
+//---------------------------------------------------------------
+AliZDCDataDCS& AliZDCDataDCS:: operator=(const AliZDCDataDCS & data) { 
+
+  // assignment operator
+
+  if (this == &data)
+    return *this;
+
+  TObject::operator=(data);
+  fRun = data.GetRun();
+  fStartTime = data.GetStartTime();
+  fEndTime = data.GetEndTime();
+  fStartTimeDCSQuery = data.GetStartTimeDCSQuery();
+  fEndTimeDCSQuery = data.GetEndTimeDCSQuery();
+//  fTimeStamp  = data.GetTimeStamp();
+//  fHVData  = data.GetHVData();
+  fIsProcessed = data.fIsProcessed; 
+
+  for(int i=0;i<kNAliases;i++) fAliasNames[i] = data.GetAliasName(i);
+  for(int i=0;i<kNAlignDet;i++) fAlignData[i] = data.GetAlignData(i);
+
+  return *this;
+}
+
 //---------------------------------------------------------------
 AliZDCDataDCS::~AliZDCDataDCS() 
 {
   // Destructor
-  fGraphs.Clear("C");
 }
 
 //---------------------------------------------------------------
-void AliZDCDataDCS::ProcessData(TMap& aliasMap, Float_t *fCalibData)
+Bool_t AliZDCDataDCS::ProcessData(TMap& aliasMap)
 {
    // Data processing
+
+   if(!(fAliasNames[0])) Init();
    
-   TObjArray *aliasArr;
-   AliDCSValue* aValue;
+   AliInfo(Form(" Start Time = %i",fStartTime));
+   AliInfo(Form(" End Time = %i",fEndTime));
+   AliInfo(Form(" Start Time DCS Query= %i",fStartTimeDCSQuery));
+   AliInfo(Form(" End Time DCS Query= %i",fEndTimeDCSQuery));
+
+   if (fEndTime==fStartTime){
+     AliError(Form(" Run with null time length: start time = %i = end time = %i",fStartTime,fEndTime));
+     return kFALSE;
+   }
+   
+   TObjArray   *aliasArr;
+   AliDCSValue *aValue;
+  
    for(int j=0; j<kNAliases; j++){
-      aliasArr = (TObjArray*) aliasMap.GetValue(fAliasNames[j].Data());
+      //printf(" Processing alias %d  aliasName %s \n", j, fAliasNames[j].Data());
+      
+      aliasArr = (TObjArray*) (aliasMap.GetValue(fAliasNames[j].Data()));
       if(!aliasArr){
-   	AliError(Form("Alias %s not found!", fAliasNames[j].Data()));
-   	continue;
+   	AliWarning(Form("Alias %s: data not found!", fAliasNames[j].Data()));
+	continue;
       }
+
       Introduce(j, aliasArr);
 
-      if(aliasArr->GetEntries()<2){
-   	AliError(Form("Alias %s has just %d entries!",
-   			fAliasNames[j].Data(),aliasArr->GetEntries()));
-   	continue;
+      Int_t nentries = aliasArr->GetEntries();
+/*      if(nentries<=2){
+        AliWarning(Form("Alias %s has just %d entries!", fAliasNames[j].Data(), nentries));
+//        continue;
       }
+*/
+      Float_t *time = new Float_t[nentries];
+      Float_t *val  = new Float_t[nentries];
 
       TIter iterarray(aliasArr);
-
-      Double_t *time = new Double_t[aliasArr->GetEntries()];
-      Double_t *val = new Double_t[aliasArr->GetEntries()];
-
+      
       UInt_t ne=0;
-      while((aValue = (AliDCSValue*) iterarray.Next())) {
-   	val[ne] = aValue->GetFloat();
-   	time[ne] = (Double_t) (aValue->GetTimeStamp());
-   	fCalibData[ne] = val[ne];
-   	ne++;
+      Float_t sum=0.;
+      Int_t nMeasures=0;
+      while((aValue = (AliDCSValue*) iterarray.Next())){
+        val[ne] = aValue->GetFloat();
+        time[ne] = (Float_t) (aValue->GetTimeStamp());
+        if(j<4){
+	  sum += val[ne];
+	  nMeasures++;
+	}
+	else{
+	  //fHVData[ne] = val[ne];
+          //fTimeStamp[ne] = time[ne];
+	}
+        ne++;
       }
       //
+      if(j<4 && nMeasures!=0) fAlignData[j] = sum/nMeasures;
       
-      //
-      if(j>=4) CreateGraph(j, aliasArr->GetEntries(), time, val); // fill graphs 
-      //
       delete[] val;
-      delete[] time;	      
+      delete[] time;   
    }
-   //
+  
    fIsProcessed=kTRUE;
-
+   return kTRUE;
+   
 }
 
 //---------------------------------------------------------------
 void AliZDCDataDCS::Init()
 {
    // Initialization
-   
-   TH1::AddDirectory(kFALSE);
-
-   fGraphs.SetOwner(1);
-
-   for(int i=0;i<kNAliases;i++){
-   	   if(i<4){
-   	     fAliasNames[i] = "ZDC.Position";
-   	     fAliasNames[i] += i;
-   	   }
-   	   else{
-   	     fAliasNames[i] = "ZDC.HVValue";
-   	     fAliasNames[i] += i-4;
-   	   }
-   }
 
+   fAliasNames[0] = "ZDC_ZNA_POS.actual.position";
+   fAliasNames[1] = "ZDC_ZPA_POS.actual.position";
+   fAliasNames[2] = "ZDC_ZNC_POS.actual.position";
+   fAliasNames[3] = "ZDC_ZPC_POS.actual.position";
+   //
+   fAliasNames[4]  = "ZDC_ZNA_HV0.actual.vMon";
+   fAliasNames[5]  = "ZDC_ZNA_HV1.actual.vMon";
+   fAliasNames[6]  = "ZDC_ZNA_HV2.actual.vMon";
+   fAliasNames[7]  = "ZDC_ZNA_HV3.actual.vMon";
+   fAliasNames[8]  = "ZDC_ZNA_HV4.actual.vMon";
+   //
+   fAliasNames[9]   = "ZDC_ZPA_HV0.actual.vMon";
+   fAliasNames[10]  = "ZDC_ZPA_HV1.actual.vMon";
+   fAliasNames[11]  = "ZDC_ZPA_HV2.actual.vMon";
+   fAliasNames[12]  = "ZDC_ZPA_HV3.actual.vMon";
+   fAliasNames[13]  = "ZDC_ZPA_HV4.actual.vMon";
+   //
+   fAliasNames[14]  = "ZDC_ZNC_HV0.actual.vMon";
+   fAliasNames[15]  = "ZDC_ZNC_HV1.actual.vMon";
+   fAliasNames[16]  = "ZDC_ZNC_HV2.actual.vMon";
+   fAliasNames[17]  = "ZDC_ZNC_HV3.actual.vMon";
+   fAliasNames[18]  = "ZDC_ZNC_HV4.actual.vMon";
+   //
+   fAliasNames[19]  = "ZDC_ZPC_HV0.actual.vMon";
+   fAliasNames[20]  = "ZDC_ZPC_HV1.actual.vMon";
+   fAliasNames[21]  = "ZDC_ZPC_HV2.actual.vMon";
+   fAliasNames[22]  = "ZDC_ZPC_HV3.actual.vMon";
+   fAliasNames[23]  = "ZDC_ZPC_HV4.actual.vMon";
+   //
+   fAliasNames[24]  = "ZDC_ZEM_HV0.actual.vMon";
+   fAliasNames[25]  = "ZDC_ZEM_HV1.actual.vMon";
+   //
+   fAliasNames[26]  = "ZDC_REFA_HV.actual.vMon";
+   fAliasNames[27]  = "ZDC_REFC_HV.actual.vMon";
+ 
 }
 
 //---------------------------------------------------------------
@@ -130,72 +228,8 @@ void AliZDCDataDCS::Introduce(UInt_t numAlias, const TObjArray* aliasArr)
 {
    // Getting array of DCS aliases
    
-   int entries=aliasArr->GetEntries();
-   AliInfo(Form("************ Alias: %s **********",fAliasNames[numAlias].Data()));
-   AliInfo(Form("	   %d DP values collected",entries));
-
-}
-
-
-//---------------------------------------------------------------
-void AliZDCDataDCS::CreateGraph(int i, int dim, const Double_t *x, const Double_t *y)
-{
-
-   // Create graphics
-   
-   TGraph *gr = new(fGraphs[fGraphs.GetEntriesFast()]) TGraph(dim, x, y);
-
-   gr->GetXaxis()->SetTimeDisplay(1);
-   gr->SetTitle(fAliasNames[i].Data());
-
-   AliInfo(Form("Array entries: %d",fGraphs.GetEntriesFast()));
-
-
-}
+   int entries = aliasArr->GetEntries();
+   printf("************ Alias: %s has  %d DP values collected\n",
+   	fAliasNames[numAlias].Data(),entries);
 
-//---------------------------------------------------------------
-void AliZDCDataDCS::Draw(const Option_t* /*option*/)
-{
-  // Draw graphics
-
-  fIsProcessed=1;
-  if(!fIsProcessed) return;
-  
-  if(fGraphs.GetEntries()==0)  return;
-  
-  TCanvas *cg1;
-  TString canvas1Name="ZN1_HVs";
-  cg1=new TCanvas(canvas1Name,canvas1Name,40,40,600,600);
-  cg1->Divide(2,2);
-  cg1->cd(1);
-  ((TGraph*) fGraphs.UncheckedAt(0))->SetMarkerStyle(20);
-  ((TGraph*) fGraphs.UncheckedAt(0))->Draw("ALP");
-  cg1->cd(2);
-  ((TGraph*) fGraphs.UncheckedAt(1))->SetMarkerStyle(20);
-  ((TGraph*) fGraphs.UncheckedAt(1))->Draw("ALP");
-  cg1->cd(3);
-  ((TGraph*) fGraphs.UncheckedAt(2))->SetMarkerStyle(20);
-  ((TGraph*) fGraphs.UncheckedAt(2))->Draw("ALP");
-  cg1->cd(4);
-  ((TGraph*) fGraphs.UncheckedAt(3))->SetMarkerStyle(20);
-  ((TGraph*) fGraphs.UncheckedAt(3))->Draw("ALP");
-  
-  TCanvas *cg2;
-  TString canvas2Name="ZP1_HVs";
-  cg2=new TCanvas(canvas2Name,canvas2Name,80,80,600,600);
-  cg2->Divide(2,2);
-  cg2->cd(1);
-  ((TGraph*) fGraphs.UncheckedAt(5))->SetMarkerStyle(20);
-  ((TGraph*) fGraphs.UncheckedAt(5))->Draw("ALP");
-  cg2->cd(2);
-  ((TGraph*) fGraphs.UncheckedAt(6))->SetMarkerStyle(20);
-  ((TGraph*) fGraphs.UncheckedAt(6))->Draw("ALP");
-  cg2->cd(3);
-  ((TGraph*) fGraphs.UncheckedAt(7))->SetMarkerStyle(20);
-  ((TGraph*) fGraphs.UncheckedAt(7))->Draw("ALP");
-  cg2->cd(4);
-  ((TGraph*) fGraphs.UncheckedAt(8))->SetMarkerStyle(20);
-  ((TGraph*) fGraphs.UncheckedAt(8))->Draw("ALP");
- 
 }
-