]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TOF/AliTOFDataDCS.cxx
Enabled option for selecting tree name in trneding macro
[u/mrichter/AliRoot.git] / TOF / AliTOFDataDCS.cxx
index c78ff35c29e63cf0afbe0ef28ca6c0baf277bf43..451cb139ee3ff370c0cb935573dd5197df09dc3e 100644 (file)
  **************************************************************************/
 
 /*
-$Log$
+$Log: AliTOFDataDCS.cxx,v $
+Revision 1.9  2007/05/04 14:02:45  decaro
+AliTOFDataDCS::Draw(Option_t *) method declared const: compiling warning suppression
+
+Revision 1.8  2007/05/03 09:45:09  decaro
+Coding convention: RN11 violation -> suppression
+
+Revision 1.7  2007/05/02 14:09:39  arcelli
+Retrieval of Env. Temperature removed (will get it from the GRP)
+
+Revision 1.6  2007/04/04 17:19:19  arcelli
+Moved some printout to debug level
+
+Revision 1.5  2007/02/20 15:57:00  decaro
+Raw data update: to read the TOF raw data defined in UNPACKED mode
+
+Revision 1.4  2007/02/19 15:41:55  decaro
+Coding convention: few corrections
+
+Revision 1.3  2007/01/24 11:19:58  arcelli
+Modify ProcessData to return a logical (CZ)
+
+Revision 1.2  2006/12/18 18:17:38  arcelli
+Updated Aliases for DCS TOF datapoints (C.Zampolli)
+
+Revision 1.1  2006/10/26 09:10:52  arcelli
+Class for handling the TOF DCS data in the Shuttle (C.Zampolli)
+
 */  
 
-#include "AliTOFDataDCS.h"
+// AliTOFDataDCS class
+// main aim to introduce the aliases for the TOF DCS
+// data points to be then
+// stored in the OCDB, and to process them. 
+// Process() method called by TOFPrepr
+
+#include "TString.h"
+#include "TTimeStamp.h"
+#include "TMap.h"
+#include "TCanvas.h"
 
 #include "AliDCSValue.h"
 #include "AliLog.h"
 
-#include "TString.h"
+#include "AliTOFDataDCS.h"
 #include "AliTOFFormatDCS.h"
-#include "TF1.h"
-#include "TCanvas.h"
-#include "TH1F.h"
-#include "TTimeStamp.h"
-#include "TMap.h"
 
 class TH2;
 class AliCDBMetaData;
 class TDatime;
 
-// AliTOFDataDCS class
-// main aim to introduce the aliases for the TOF DCS
-// data points to be then
-// stored in the OCDB, and to process them. 
-// Process() method called by TOFPrepr
-
 ClassImp(AliTOFDataDCS)
 
 //---------------------------------------------------------------
@@ -48,52 +73,43 @@ AliTOFDataDCS::AliTOFDataDCS():
        fRun(0),
        fStartTime(0),
        fEndTime(0),
-       fIsProcessed(kFALSE)
+       fStartTimeDCSQuery(0),
+       fEndTimeDCSQuery(0),
+       fIsProcessed(kFALSE),
+       fFDR(kFALSE)
 {
 
   // main constructor 
 
-       for(int i=0;i<kNHV;i++) {
-         fHVvpos[i]=0x0;
-         fHVvneg[i]=0x0;
-         fHVcpos[i]=0x0;
-         fHVcneg[i]=0x0;
-       }
-
-       for(int i=0;i<kNLV;i++) {
-         fLVv[i]=0x0;
-         fLVc[i]=0x0;
-       }
-
-       for(int i=0;i<kNFEEthr;i++) {
-         fFEEthr[i]=0x0;
-       }
-
-       for(int i=0;i<kNFEEt;i++) {
-         fFEEt[i]=0x0;
-       }
-
-       for(int i=0;i<3;i++) {
-         fT[i]=0;
-         fP[i]=0;
-       }
-
+  for(int i=0;i<kNHV;i++) {
+    fHVvp[i]=0x0;
+    fHVvn[i]=0x0;
+    fHVip[i]=0x0;
+    fHVin[i]=0x0;
+  }
+    
+  
 }
 
 //---------------------------------------------------------------
-AliTOFDataDCS::AliTOFDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime):
+AliTOFDataDCS::AliTOFDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime, UInt_t startTimeDCSQuery, UInt_t endTimeDCSQuery):
        TObject(),
        fRun(nRun),
        fStartTime(startTime),
        fEndTime(endTime),
-       fIsProcessed(kFALSE)
+       fStartTimeDCSQuery(startTimeDCSQuery),
+       fEndTimeDCSQuery(endTimeDCSQuery),
+       fIsProcessed(kFALSE),
+       fFDR(kFALSE)
 {
 
   // constructor with arguments
 
-       AliInfo(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", nRun,
+       AliInfo(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();
 
@@ -102,93 +118,59 @@ AliTOFDataDCS::AliTOFDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime):
 //---------------------------------------------------------------
 
 AliTOFDataDCS::AliTOFDataDCS(const AliTOFDataDCS & data):
-  TObject(), 
-  fRun(0),
-  fStartTime(0),
-  fEndTime(0),
-  fIsProcessed(kFALSE)
+  TObject(data), 
+  fRun(data.fRun),
+  fStartTime(data.fStartTime),
+  fEndTime(data.fEndTime),
+  fStartTimeDCSQuery(data.fStartTimeDCSQuery),
+  fEndTimeDCSQuery(data.fEndTimeDCSQuery),
+  fIsProcessed(data.fIsProcessed),
+  fFDR(data.fFDR)
 
 {
 
-// copy constructor
-
-  fRun=data.fRun;
-  fStartTime=data.fStartTime;
-  fEndTime=data.fEndTime;
-  fIsProcessed=data.fIsProcessed;
+  // copy constructor
 
   for(int i=0;i<kNAliases;i++) {
     fAliasNames[i]=data.fAliasNames[i];
   }
  
   for(int i=0;i<kNHV;i++) {
-    fHVvpos[i]=data.fHVvpos[i];
-    fHVvneg[i]=data.fHVvneg[i];
-    fHVcpos[i]=data.fHVcpos[i];
-    fHVcneg[i]=data.fHVcneg[i];
-  }
-  
-  for(int i=0;i<kNLV;i++) {
-    fLVv[i]=data.fLVv[i];
-    fLVc[i]=data.fLVc[i];
-  }
-
-  for(int i=0;i<kNFEEthr;i++) {
-    fFEEthr[i]=data.fFEEthr[i];
-  }
-
-  for(int i=0;i<kNFEEt;i++) {
-    fFEEt[i]=data.fFEEt[i];
-  }
-  
-  for(int i=0;i<3;i++) {
-    fT[i]=data.fT[i];
-    fP[i]=data.fP[i];
+    fHVvp[i]=data.fHVvp[i];
+    fHVvn[i]=data.fHVvn[i];
+    fHVip[i]=data.fHVip[i];
+    fHVin[i]=data.fHVin[i];
   }
   
+    
 }
 //---------------------------------------------------------------
 
 AliTOFDataDCS& AliTOFDataDCS:: operator=(const AliTOFDataDCS & data) { 
 
-// assignment operator
+  // assignment operator
 
-  this->fRun=data.GetRun();
-  this->fStartTime=data.GetStartTime();
-  this->fEndTime=data.GetEndTime();
+  if (this == &data)
+    return *this;
 
-  for(int i=0;i<kNAliases;i++) {
-    this->fAliasNames[i]=data.GetAliasName(i);
-  }
+  TObject::operator=(data);
+  fRun=data.GetRun();
+  fStartTime=data.GetStartTime();
+  fEndTime=data.GetEndTime();
+  fStartTimeDCSQuery=data.GetStartTimeDCSQuery();
+  fEndTimeDCSQuery=data.GetEndTimeDCSQuery();
 
-  for(int i=0;i<3;i++) {
-    this->fT[i]=data.GetT(i);
-    this->fP[i]=data.GetP(i);
+  for(int i=0;i<kNAliases;i++) {
+    fAliasNames[i]=data.GetAliasName(i);
   }
 
-  //this->fCal=data.GetCal();
-
   for(int i=0;i<kNHV;i++) {
-    this->fHVvpos[i]=data.GetHVvpos(i);
-    this->fHVvneg[i]=data.GetHVvneg(i);
-    this->fHVcpos[i]=data.GetHVcpos(i);
-    this->fHVcneg[i]=data.GetHVcneg(i);
-  }
-
-  for(int i=0;i<kNLV;i++) {
-    this->fLVv[i]=data.GetLVv(i);
-    this->fLVc[i]=data.GetLVc(i);
+    fHVvp[i]=data.GetHVvp(i);
+    fHVvn[i]=data.GetHVvn(i);
+    fHVip[i]=data.GetHVip(i);
+    fHVin[i]=data.GetHVin(i);
   }
 
-  for(int i=0;i<kNFEEthr;i++) {
-    this->fFEEthr[i]=data.GetFEEthr(i);
-  }
-
-  for(int i=0;i<kNFEEt;i++) {
-    this->fFEEt[i]=data.GetFEEt(i);
-  }
-
-  this->fIsProcessed=data.fIsProcessed;
 
   return *this;
 }
@@ -197,77 +179,49 @@ AliTOFDataDCS::~AliTOFDataDCS() {
 
   // destructor
 
-       for(int i=0;i<kNHV;i++) {
-         delete fHVvpos[i];
-         fHVvpos[i]=0;
-         delete fHVvneg[i];
-         fHVvneg[i]=0;
-         delete fHVcpos[i];
-         fHVcpos[i]=0;
-         delete fHVcneg[i];
-         fHVcneg[i]=0;
-       }
-
-       for(int i=0;i<kNLV;i++) {
-         delete fLVv[i];
-         fLVv[i]=0;
-         delete fLVc[i];
-         fLVc[i]=0;
-       }
-
-       for(int i=0;i<kNFEEthr;i++) {
-         delete fFEEthr[i];
-         fFEEthr[i]=0;
-       }
-
-       for(int i=0;i<kNFEEt;i++) {
-         delete fFEEt[i];
-         fFEEt[i]=0;
-       }
-}
-
-//-----------------------------------------------------------------------------
-Float_t* AliTOFDataDCS::GetT()const {
-
-  // method to retrieve environment temperature info
-
-  Float_t* t=0;
-  for (Int_t i=0;i<3;i++){
-    t[i]=this->fT[i];
-  }
-  return t;
-}
-//-----------------------------------------------------------------------------
-Float_t* AliTOFDataDCS::GetP() const{
-
-  // method to retrieve environment pressure info
-
-  Float_t* p=0;
-  for (Int_t i=0;i<3;i++){
-    p[i]=this->fP[i];
+  for(int i=0;i<kNHV;i++) {
+    delete fHVvp[i];
+    fHVvp[i]=0;
+    delete fHVvn[i];
+    fHVvn[i]=0;
+    delete fHVip[i];
+    fHVip[i]=0;
+    delete fHVin[i];
+    fHVin[i]=0;
   }
-  return p;
+  
 }
 
 //---------------------------------------------------------------
-void AliTOFDataDCS::ProcessData(TMap& aliasMap){
+Bool_t AliTOFDataDCS::ProcessData(TMap& aliasMap){
+
+  // method to process the data
 
   if(!(fAliasNames[0])) Init();
 
-  Float_t timeMin = (Float_t)fStartTime;
-  Float_t timeMax = (Float_t)fEndTime;
-  Int_t nminutes = (Int_t)((timeMax-timeMin)/60);
   Float_t val=0;
+  Float_t val0=0;
   Float_t val1=0;
   Float_t time=0; 
+  Float_t time0=0; 
+  Float_t time1=0; 
   Float_t delta[2];
   Float_t timedelta[2];
 
+  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;
+  AliDCSValue* aValue0;
   AliDCSValue* aValue1;
-  TH1F * histoT=0x0;
-  TH1F * histoP=0x0;
 
   // starting loop on aliases
   for(int j=0; j<kNAliases; j++){
@@ -279,136 +233,136 @@ void AliTOFDataDCS::ProcessData(TMap& aliasMap){
     aliasArr = (TObjArray*) aliasMap.GetValue(fAliasNames[j].Data());
     if(!aliasArr){
       AliError(Form("Alias %s not found!", fAliasNames[j].Data()));
-      continue;
+      if (!fFDR){
+       return kFALSE;    // returning only in case we are not in a FDR run
+      }
+      else {
+       continue;
+      }
     }
 
     Introduce(j, aliasArr);
     
-    if(aliasArr->GetEntries()<3){
-      AliError(Form("Alias %s has just %d entries!",
+    if(aliasArr->GetEntries()==0){
+      AliError(Form("Alias %s has no entries! Nothing will be stored",
+                   fAliasNames[j].Data()));
+      continue;
+    }
+    if(aliasArr->GetEntries() == 1){
+      AliWarning(Form("Alias %s has just %d entries! Only first value will be stored",
+                   fAliasNames[j].Data(),aliasArr->GetEntries()));
+      aValue0 = (AliDCSValue*) aliasArr->At(0);
+      val0 = aValue0->GetFloat();
+      time0 = (Float_t) (aValue0->GetTimeStamp());
+      if (j<kNHV){
+       fHVvp[j]->SetFloat(0,val0);
+       fHVvp[j]->SetTimeStampFloat(0,time0);
+      }
+      else if (j<kNHV*2){
+       fHVvn[j-kNHV]->SetFloat(0,val0);
+       fHVvn[j-kNHV]->SetTimeStampFloat(0,time0);
+      }
+      else if (j<kNHV*3){
+       fHVip[j-2*kNHV]->SetFloat(0,val0);
+       fHVip[j-2*kNHV]->SetTimeStampFloat(0,time0);
+      }
+      else if (j<kNHV*4){
+       fHVin[j-3*kNHV]->SetFloat(0,val0);
+       fHVin[j-3*kNHV]->SetTimeStampFloat(0,time0);
+      }
+      continue;
+    }
+    if(aliasArr->GetEntries()==2){
+      AliWarning(Form("Alias %s has just %d entries! Storing first and second entry only and the delta between these two",
                    fAliasNames[j].Data(),aliasArr->GetEntries()));
+      aValue0 = (AliDCSValue*) aliasArr->At(0);
+      val0 = aValue0->GetFloat();
+      time0 = (Float_t) (aValue0->GetTimeStamp());
+      aValue1 = (AliDCSValue*) aliasArr->At(1);
+      val1 = aValue1->GetFloat();
+      time1 = (Float_t) (aValue1->GetTimeStamp());
+      if (j<kNHV){
+       fHVvp[j]->SetFloat(0,val0);
+       fHVvp[j]->SetTimeStampFloat(0,time0);
+       fHVvp[j]->SetFloat(1,val1);
+       fHVvp[j]->SetTimeStampFloat(1,time1);
+       fHVvp[j]->SetDelta(0,TMath::Abs(val1-val0));
+       fHVvp[j]->SetTimeStampDelta(0,time1-time0);
+      }
+      else if (j<kNHV*2){
+       fHVvn[j-kNHV]->SetFloat(0,val0);
+       fHVvn[j-kNHV]->SetTimeStampFloat(0,time0);
+       fHVvn[j-kNHV]->SetFloat(1,val1);
+       fHVvn[j-kNHV]->SetTimeStampFloat(1,time1);
+       fHVvn[j-kNHV]->SetDelta(0,TMath::Abs(val1-val0));
+       fHVvn[j-kNHV]->SetTimeStampDelta(0,time1-time0);
+      }
+      else if (j<kNHV*3){
+       fHVip[j-2*kNHV]->SetFloat(0,val0);
+       fHVip[j-2*kNHV]->SetTimeStampFloat(0,time0);
+       fHVip[j-2*kNHV]->SetFloat(1,val1);
+       fHVip[j-2*kNHV]->SetTimeStampFloat(1,time1);
+       fHVip[j-2*kNHV]->SetDelta(0,TMath::Abs(val1-val0));
+       fHVip[j-2*kNHV]->SetTimeStampDelta(0,time1-time0);
+      }
+      else if (j<kNHV*4){
+       fHVin[j-3*kNHV]->SetFloat(0,val0);
+       fHVin[j-3*kNHV]->SetTimeStampFloat(0,time0);
+       fHVin[j-3*kNHV]->SetFloat(1,val1);
+       fHVin[j-3*kNHV]->SetTimeStampFloat(1,time1);
+       fHVin[j-3*kNHV]->SetDelta(0,TMath::Abs(val1-val0));
+       fHVin[j-3*kNHV]->SetTimeStampDelta(0,time1-time0);
+      }
       continue;
     }
     
     TIter iterarray(aliasArr);
     
     Int_t nentries = aliasArr->GetEntries();
-    //AliInfo(Form("entries = %i",nentries));
     Int_t deltaTimeStamp = (Int_t) nentries/3;
     Int_t deltaTimeStamp1 = (Int_t) nentries/2;
-    AliDCSValue *lastDCSvalue = (AliDCSValue*) aliasArr->At(nentries-1);
-    Float_t maxTimeStamp = (Float_t) (lastDCSvalue->GetTimeStamp());
-    Float_t minTimeStamp = 0;
 
     // filling aliases with 10 floats+1 Usign
-    if (j < kNHV*4+kNLV*2+kNFEEthr+kNFEEt){
-      Int_t index = 0;
-      for (Int_t k=0;k<3;k++){
-       index = deltaTimeStamp*k;
-       if (k==0) {
-         index=0;
-       }
-       else if (k==1) {
-         index=deltaTimeStamp1;
-       } 
-       else if (k==2) {
-         index=nentries-1; 
-       }
-       aValue = (AliDCSValue*) aliasArr->At(index);
-       val = aValue->GetFloat();
-       time = (Float_t) (aValue->GetTimeStamp());
-       if (j<kNHV){
-         fHVvpos[j]->SetFloat(k,val);
-         fHVvpos[j]->SetTimeStampFloat(k,time);
-       }
-       else if (j<kNHV*2){
-         fHVvneg[j-kNHV]->SetFloat(k,val);
-         fHVvneg[j-kNHV]->SetTimeStampFloat(k,time);
-       }
-       else if (j<kNHV*3){
-         fHVcpos[j-2*kNHV]->SetFloat(k,val);
-         fHVcpos[j-2*kNHV]->SetTimeStampFloat(k,time);
-       }
-       else if (j<kNHV*4){
-         fHVcneg[j-3*kNHV]->SetFloat(k,val);
-         fHVcneg[j-3*kNHV]->SetTimeStampFloat(k,time);
-       }
-       else if (j<kNHV*4+kNLV){
-         fLVv[j-4*kNHV]->SetFloat(k,val);
-         fLVv[j-4*kNHV]->SetTimeStampFloat(k,time);
-       }
-       else if (j<kNHV*4+kNLV*2){
-         fLVc[j-4*kNHV-kNLV]->SetFloat(k,val);
-         fLVc[j-4*kNHV-kNLV]->SetTimeStampFloat(k,time);
-       }
-       else if (j<kNHV*4+kNLV*2+kNFEEthr){
-         fFEEthr[j-4*kNHV-2*kNLV]->SetFloat(k,val);
-         fFEEthr[j-4*kNHV-2*kNLV]->SetTimeStampFloat(k,time);
-       }
-       else {
-         fFEEt[j-4*kNHV-2*kNLV-kNFEEthr]->SetFloat(k,val);
-         fFEEt[j-4*kNHV-2*kNLV-kNFEEthr]->SetTimeStampFloat(k,time);
-       }
+    Int_t index = 0;
+    for (Int_t k=0;k<3;k++){
+      index = deltaTimeStamp*k;
+      if (k==0) {
+       index=0;
       }
-    }
-  
-    //filling Temperature and Pressure aliases
-    
-    else {
-      Int_t entriesT=0;
-      Int_t entriesP=0;
-      if (j<kNHV*4+kNLV*2+kNFEEthr+kNFEEt+1){
-       histoT=new TH1F("histoT","histoT",nentries,minTimeStamp,maxTimeStamp);
+      else if (k==1) {
+       index=deltaTimeStamp1;
+      } 
+      else if (k==2) {
+       index=nentries-1; 
       }
-      else if (j<kNHV*4+kNLV*2+kNFEEthr+kNFEEt+2) {
-       histoP=new TH1F("histoP","histoP",nentries,minTimeStamp,maxTimeStamp);
+      aValue = (AliDCSValue*) aliasArr->At(index);
+      val = aValue->GetFloat();
+      time = (Float_t) (aValue->GetTimeStamp());
+      if (j<kNHV){
+       fHVvp[j]->SetFloat(k,val);
+       fHVvp[j]->SetTimeStampFloat(k,time);
       }
-      while ((aValue = (AliDCSValue*) iterarray.Next())) {
-       val = aValue->GetFloat();
-       time = (Float_t) (aValue->GetTimeStamp());
-       if (j<kNHV*4+kNLV*2+kNFEEthr+kNFEEt+1){
-         histoT->Fill(time,val);
-         entriesT = (Int_t)(histoT->GetEntries());
-       }
-       else if (j<kNHV*4+kNLV*2+kNFEEthr+kNFEEt+2){
-         histoP->Fill(time,val);
-         entriesP = (Int_t)(histoP->GetEntries());
-       }
+      else if (j<kNHV*2){
+       fHVvn[j-kNHV]->SetFloat(k,val);
+       fHVvn[j-kNHV]->SetTimeStampFloat(k,time);
       }
-    
-      if (j==kNHV*4+kNLV*2+kNFEEthr+kNFEEt+1){
-       entriesT = (Int_t)(histoT->GetEntries());
-       histoT->Fit("pol1","Q","");
-       histoP->Fit("pol1","Q","");
-      
-       TF1 *tempFunc = histoT->GetFunction("pol1");
-       TF1 *pressFunc = histoP->GetFunction("pol1");
-      
-       SetInterceptT((Float_t)tempFunc->GetParameter(0));
-       SetSlopeT((Float_t)tempFunc->GetParameter(1));
-       SetMaxT((Float_t)histoT->GetMaximum());
-       SetInterceptP((Float_t)pressFunc->GetParameter(0));
-       SetSlopeP((Float_t)pressFunc->GetParameter(1));
-       SetMaxP((Float_t)histoP->GetMaximum());
-      
-       TCanvas *chT;
-       TString canvasHistoNameT="HistosT";
-       chT=new TCanvas(canvasHistoNameT,canvasHistoNameT,20,20,600,600);
-       chT->cd();
-       histoT->Draw();
-       TCanvas *chP;
-       TString canvasHistoNameP="HistosP";
-       chP=new TCanvas(canvasHistoNameP,canvasHistoNameP,20,20,600,600);
-       chP->cd();
-       histoP->Draw();
+      else if (j<kNHV*3){
+       fHVip[j-2*kNHV]->SetFloat(k,val);
+       fHVip[j-2*kNHV]->SetTimeStampFloat(k,time);
+      }
+      else if (j<kNHV*4){
+       fHVin[j-3*kNHV]->SetFloat(k,val);
+       fHVin[j-3*kNHV]->SetTimeStampFloat(k,time);
       }
     }
+  
     //computing the most significant variations
 
-    Int_t deltamin = (Int_t)(60/(timeMax-timeMin)*nentries);
+    //Float_t timeDiff = (Float_t)(fEndTime-fStartTime);
+    Float_t timeDiff = (Float_t)(fEndTimeDCSQuery-fStartTimeDCSQuery);
+    Int_t deltamin = (Int_t)(60/timeDiff*nentries); //sampling every minute
     Int_t klast = nentries-deltamin;
-    
+      
     for (Int_t k=0;k<klast;k++){
       aValue = (AliDCSValue*) aliasArr->At(k);
       aValue1 = (AliDCSValue*) aliasArr->At(k+deltamin);
@@ -429,56 +383,28 @@ void AliTOFDataDCS::ProcessData(TMap& aliasMap){
     }
     
     for (Int_t kk=0;kk<2;kk++){
-      if (j < kNHV*4+kNLV*2+kNFEEthr){
-       if (j<kNHV){
-         fHVvpos[j]->SetDelta(kk,delta[kk]);
-         fHVvpos[j]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
-       }
-       else if (j<kNHV*2){
-         fHVvneg[j-kNHV]->SetDelta(kk,delta[kk]);
-         fHVvneg[j-kNHV]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
-       }
-       else if (j<kNHV*3){
-         fHVcpos[j-2*kNHV]->SetDelta(kk,delta[kk]);
-         fHVcpos[j-2*kNHV]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
-       }
-       else if (j<kNHV*4){
-         fHVcneg[j-3*kNHV]->SetDelta(kk,delta[kk]);
-         fHVcneg[j-3*kNHV]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
-       }
-       else if (j<kNHV*4+kNLV){
-         fLVv[j-4*kNHV]->SetDelta(kk,delta[kk]);
-         fLVv[j-4*kNHV]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
-       }
-       else if (j<kNHV*4+kNLV*2){
-         fLVc[j-4*kNHV-kNLV]->SetDelta(kk,delta[kk]);
-         fLVc[j-4*kNHV-kNLV]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
-       }
-       else if (j<kNHV*4+kNLV*2+kNFEEthr){
-         fFEEthr[j-4*kNHV-2*kNLV]->SetDelta(kk,delta[kk]);
-         fFEEthr[j-4*kNHV-2*kNLV]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
-       }
-       else if (j<kNHV*4+kNLV*2+kNFEEthr+kNFEEt){
-         fFEEt[j-4*kNHV-2*kNLV+kNFEEthr]->SetDelta(kk,delta[kk]);
-         fFEEt[j-4*kNHV-2*kNLV+kNFEEthr]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
-       }
+      if (j<kNHV){
+       fHVvp[j]->SetDelta(kk,delta[kk]);
+       fHVvp[j]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
       }
-       
-      
-    //filling for temperature and pressure
-    
-      else if (j==kNHV*4+kNLV*2+kNFEEthr+kNFEEt){
-       fT[2]=delta[1];
+      else if (j<kNHV*2){
+       fHVvn[j-kNHV]->SetDelta(kk,delta[kk]);
+       fHVvn[j-kNHV]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
       }
-      else if (j==kNHV*4+kNLV*2+kNFEEthr+kNFEEt+1){
-       fP[2]=delta[1];
+      else if (j<kNHV*3){
+       fHVip[j-2*kNHV]->SetDelta(kk,delta[kk]);
+       fHVip[j-2*kNHV]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
       }
-      
-        }
+      else if (j<kNHV*4){
+       fHVin[j-3*kNHV]->SetDelta(kk,delta[kk]);
+       fHVin[j-3*kNHV]->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
+      }
+    }
   }
-    
+  
   fIsProcessed=kTRUE;
 
+  return kTRUE;
 }
 
 //---------------------------------------------------------------
@@ -486,53 +412,33 @@ void AliTOFDataDCS::Init(){
 
   // initialization of aliases and DCS data
 
+  TString sindex;
   for(int i=0;i<kNAliases;i++){
+    //HV, v
     if (i<kNHV){
-       fAliasNames[i] = "HVvpos";
-       fAliasNames[i] += i;
-       //AliInfo(Form("i = %i, alias name = %s ", i, fAliasNames[i].Data())); 
-       fHVvpos[i] = new AliTOFFormatDCS();
+       fAliasNames[i] = "tof_hv_vp_";
+       sindex.Form("%02i",i);
+       fAliasNames[i] += sindex;
+       fHVvp[i] = new AliTOFFormatDCS();
     }
     else if (i<kNHV*2){
-       fAliasNames[i] = "HVvneg";
-       fAliasNames[i] += i-kNHV;
-       fHVvneg[i-kNHV] = new AliTOFFormatDCS();
+       fAliasNames[i] = "tof_hv_vn_";
+       sindex.Form("%02i",i-kNHV);
+       fAliasNames[i] += sindex;
+       fHVvn[i-kNHV] = new AliTOFFormatDCS();
     }
+    //HV, i
     else if (i<kNHV*3){
-       fAliasNames[i] = "HVcpos";
-       fAliasNames[i] += i-2*kNHV;
-       fHVcpos[i-2*kNHV] = new AliTOFFormatDCS();
+       fAliasNames[i] = "tof_hv_ip_";
+       sindex.Form("%02i",i-2*kNHV);
+       fAliasNames[i] += sindex;
+       fHVip[i-2*kNHV] = new AliTOFFormatDCS();
     }
     else if (i<kNHV*4){
-       fAliasNames[i] = "HVcneg";
-       fAliasNames[i] += i-3*kNHV;
-       fHVcneg[i-3*kNHV] = new AliTOFFormatDCS();
-    }
-    else if (i<(kNHV*4+kNLV)){
-       fAliasNames[i] = "LVv";
-       fAliasNames[i] += i-4*kNHV;
-       fLVv[i-4*kNHV] = new AliTOFFormatDCS();
-    }
-    else if (i<(kNHV*4+kNLV*2)){
-       fAliasNames[i] = "LVc";
-       fAliasNames[i] += i-4*kNHV-kNLV;
-       fLVc[i-4*kNHV-kNLV] = new AliTOFFormatDCS();
-    }
-    else if (i<(kNHV*4+kNLV*2+kNFEEthr)){
-       fAliasNames[i] = "FEEthr";
-       fAliasNames[i] += i-4*kNHV-2*kNLV;
-       fFEEthr[i-4*kNHV-2*kNLV] = new AliTOFFormatDCS();
-    }
-    else if (i<(kNHV*4+kNLV*2+kNFEEthr+kNFEEt)){
-       fAliasNames[i] = "FEEt";
-       fAliasNames[i] += i-4*kNHV-2*kNLV-kNFEEthr;
-       fFEEt[i-4*kNHV-2*kNLV-kNFEEthr] = new AliTOFFormatDCS();
-    }
-    else if (i<(kNHV*4+kNLV*2+kNFEEthr+kNFEEt+1)){
-       fAliasNames[i] = "Temperature";
-    }
-    else if (i<(kNHV*4+kNLV*2+kNFEEthr+kNFEEt+2)){
-       fAliasNames[i] = "Pressure";
+       fAliasNames[i] = "tof_hv_in_";
+       sindex.Form("%02i",i-3*kNHV);
+       fAliasNames[i] += sindex;
+       fHVin[i-3*kNHV] = new AliTOFFormatDCS();
     }
   }
 }
@@ -548,15 +454,15 @@ void AliTOFDataDCS::Introduce(UInt_t numAlias, const TObjArray* aliasArr)const
   entries = aliasArr->GetEntries();
   int nal=0;
   nal=numAlias;
-  //AliInfo(Form("************ Alias: %s **********",fAliasNames[numAlias].Data()));
-  //AliInfo(Form("     %d DP values collected",entries));
+  AliDebug(2,Form("************ Alias: %s **********",fAliasNames[numAlias].Data()));
+  AliDebug(2,Form("            %d DP values collected",entries));
 
 }
 
 //---------------------------------------------------------------
 void AliTOFDataDCS::Draw(const Option_t* /*option*/)
 {
-// Draw all histos and graphs
+  // Draw all histos and graphs
 
   if(!fIsProcessed) return;