Adding TDC channel delays to the calib object.

diff --git a/VZERO/AliVZEROCalibData.cxx b/VZERO/AliVZEROCalibData.cxx
index 8ff4e3fa5d0cc01a04322ecf688f313463d8a7a6..606d03c8f29b86ebdadc2006d2aec4a2568687e2 100644 (file)
--- a/VZERO/AliVZEROCalibData.cxx
+++ b/VZERO/AliVZEROCalibData.cxx
@@ -203,10 +203,16 @@ void AliVZEROCalibData::SetParameter(TString name, Int_t val){
        // Set given parameter
        
        Int_t iBoard = -1;
+       Int_t iChannel = -1;
 
        TSeqCollection* nameSplit = name.Tokenize("/");
        TObjString * boardName = (TObjString *)nameSplit->At(2);
        sscanf(boardName->String().Data(),"CIU%d",&iBoard);
+
+       TString paramName = ((TObjString *)nameSplit->At(3))->String();
+       Char_t channel[2] ; channel[1] = '\0';
+       channel[0] = paramName[paramName.Sizeof()-2];
+       sscanf(channel,"%d",&iChannel);
                
        if(name.Contains("TimeResolution")) SetTimeResolution((UShort_t) val,iBoard);
        else if(name.Contains("WidthResolution")) SetWidthResolution((UShort_t) val,iBoard);
@@ -214,6 +220,7 @@ void AliVZEROCalibData::SetParameter(TString name, Int_t val){
        else if(name.Contains("SearchWindow")) SetSearchWindow((UInt_t) val,iBoard);
        else if(name.Contains("TriggerCountOffset")) SetTriggerCountOffset((UInt_t) val,iBoard);
        else if(name.Contains("RollOver")) SetRollOver((UInt_t) val,iBoard);
+       else if(name.Contains("DelayHit")) SetTimeOffset(0.01*(Float_t)val,8*iBoard+(iChannel-1));
        else AliError(Form("No Setter found for FEE parameter : %s",name.Data()));
 }
 
@@ -273,6 +280,17 @@ void AliVZEROCalibData::SetGain(const Float_t* Gain)
   else for(int t=0; t<128; t++) fGain[t] = 0.0;
 }
 
+//________________________________________________________________
+void AliVZEROCalibData::SetTimeOffset(Float_t val, Int_t channel)
+{
+  if((channel>=0) && (channel<64)){
+    fTimeOffset[channel]=val;
+    AliInfo(Form("Time offset for channel &d set to %f",channel,fTimeOffset[channel]));
+  }
+  else
+    AliError(Form("Channel %d is not valid",channel));
+}
+
 //________________________________________________________________
 void AliVZEROCalibData::SetTimeOffset(const Float_t* TimeOffset) 
 {

diff --git a/VZERO/AliVZEROCalibData.h b/VZERO/AliVZEROCalibData.h
index b8073886c13a16335ce1f50722a6adf2a6f3af5e..9df98fbdbc0bf2b7af7ca334e28bd627219e7a83 100644 (file)
--- a/VZERO/AliVZEROCalibData.h
+++ b/VZERO/AliVZEROCalibData.h
@@ -81,7 +81,7 @@ class AliVZEROCalibData: public TNamed {
    
   void            SetGain(Float_t val, Int_t channel) {fGain[channel]=val;}
   void            SetGain(const Float_t* Gain);  
-  void     SetTimeOffset(Float_t val, Int_t channel) {fTimeOffset[channel]=val;}
+  void     SetTimeOffset(Float_t val, Int_t channel);
   void     SetTimeOffset(const Float_t* TimeOffset);
   void     SetTimeGain(Float_t val, Int_t channel) {fTimeGain[channel]=val;}
   void     SetTimeGain(const Float_t* TimeGain);

diff --git a/VZERO/AliVZERODataDCS.cxx b/VZERO/AliVZERODataDCS.cxx
index 5217b7daa96e410bc671998d3ad14e41bb34e396..3585eaa4268ff5be9a1dc8ed0bfa5fa368c0cda1 100644 (file)
--- a/VZERO/AliVZERODataDCS.cxx
+++ b/VZERO/AliVZERODataDCS.cxx
@@ -210,6 +210,12 @@ void AliVZERODataDCS::Init(){
          fAliasNames[iAlias++] = Form("V00/FEE/CIU%d/RollOver",iCIU);
        }
 
+       for(int iCIU = 0; iCIU<8 ; iCIU++){
+         for(int iCh=1;iCh<=8;iCh++){
+           fAliasNames[iAlias++] = Form("V00/FEE/CIU%d/DelayHit%d",iCIU,iCh);
+         }
+       }
+
   if(iAlias!=kNAliases) 
              AliError(Form("Number of DCS Aliases defined not correct"));
 

diff --git a/VZERO/AliVZERODataDCS.h b/VZERO/AliVZERODataDCS.h
index c72c97c2b9c45a6f20b03d710c5fea65414e5ea1..a76593c1249bd79f0eb7de194f893ff1340efb0e 100644 (file)
--- a/VZERO/AliVZERODataDCS.h
+++ b/VZERO/AliVZERODataDCS.h
@@ -20,7 +20,7 @@ class TH1F;
 
 class AliVZERODataDCS : public TObject {
 public:
-  enum {kNAliases=112,kNGraphs=64,kNHvChannel=64,kNLvChannel=16,kNCIUBoards = 8};
+  enum {kNAliases=176,kNGraphs=64,kNHvChannel=64,kNLvChannel=16,kNCIUBoards = 8};
   enum {kHvMin=0, kHvMax=3000};
   
   AliVZERODataDCS();