Mistyping corrected.

[u/mrichter/AliRoot.git] / T0 / AliT0CalibData.cxx

diff --git a/T0/AliT0CalibData.cxx b/T0/AliT0CalibData.cxx
index 67f496d0de6c6f5b21e2ef9f225cc4fefda8ef18..2dff0cad0f5502ebefae0b30341eb6cf84cfca3b 100644 (file)
--- a/T0/AliT0CalibData.cxx
+++ b/T0/AliT0CalibData.cxx
@@ -41,7 +41,13 @@
 ClassImp(AliT0CalibData)
 
 //________________________________________________________________
-  AliT0CalibData::AliT0CalibData():   TNamed()
+  AliT0CalibData::AliT0CalibData():   TNamed(),
+                                     fTimeDelayTVD(0),
+                                     fMeanT0(0),
+                                     fWalk(0),
+                                     fAmpLEDRec(0),
+                                     fLookup(0),
+                                     fNumberOfTRMs(0)
 
 {
   //
@@ -52,7 +58,6 @@ AliT0CalibData::AliT0CalibData(const char* name):TNamed(),
                                      fTimeDelayTVD(0),
                                      fMeanT0(0),
                                      fWalk(0),
-                                     fAmpLED(0),
                                      fAmpLEDRec(0),
                                      fLookup(0),
                                      fNumberOfTRMs(0)
@@ -70,7 +75,7 @@ AliT0CalibData::AliT0CalibData(const AliT0CalibData& calibda) :
   fTimeDelayTVD(0),
   fMeanT0(0),
   fWalk(0),
-  fAmpLED(0),
+  //  fAmpLED(0),
   fAmpLEDRec(0),
   fLookup(0),
   fNumberOfTRMs(0)
@@ -123,24 +128,32 @@ void  AliT0CalibData::PrintLookup(Option_t*, Int_t iTRM, Int_t iTDC, Int_t iChan
   AliT0LookUpValue*  lookvalue= new AliT0LookUpValue();
 
   cout<<" Number Of TRMs in setup "<<GetNumberOfTRMs()<<endl;
-  lookvalue->SetTRM(iTRM);
-  lookvalue->SetTDC(iTDC);
-  lookvalue->SetChain(0);
-  lookvalue->SetChannel(iChannel);
-
-  
-  printf(" AliT0CalibData::PrintLookup ::start GetValue %i %i %i \n",iTRM, iTDC, iChannel);
-  lookkey = (AliT0LookUpKey*) fLookup.GetValue((TObject*)lookvalue);
-  
-
-  if (lookkey)
-    {
-      cout<<" lookup KEY!!! "<<lookkey->GetKey()<<" VALUE "<<lookvalue->GetTRM()<<" "
-         <<lookvalue->GetTDC()<<" "
-         << lookvalue->GetChain()<<" "
+  iTRM=0; iTDC=0; Int_t chain=0; iChannel=0;
+
+  for (Int_t ik=0; ik<105; ik++){
+    lookvalue->SetTRM(iTRM);
+    lookvalue->SetTDC(iTDC);
+    lookvalue->SetChain(chain);
+    lookvalue->SetChannel(iChannel);
+    
+    if (iChannel<6) iChannel +=2;
+    else {iChannel = 0; iTDC++;}
+    if(ik==57) { iTDC=0; iChannel=0; iTRM=1;}
+   
+  printf(" AliT0CalibData::PrintLookup ::start GetValue %i %i %i %i\n",iTRM, iTDC,chain, iChannel);
+    lookkey = (AliT0LookUpKey*) fLookup.GetValue((TObject*)lookvalue);
+    cout<<"  lookkey "<< lookkey<<endl;
+    //    TString name= lookkey->GetChannelName();
+    // cout<<name.Data()<<endl;
+    if (lookkey)
+      {
+       TString name= lookkey->GetChannelName();
+       cout<<" lookup KEY!!! "<<name.Data()<<" "<<lookkey->GetKey()<<" VALUE "<<lookvalue->GetTRM()<<" "
+           <<lookvalue->GetTDC()<<" "
+           << lookvalue->GetChain()<<" "
          <<lookvalue->GetChannel()<<endl;
-    }
-  
+      }
+  }
   
 }
 
@@ -213,7 +226,7 @@ void AliT0CalibData::SetWalk(Int_t ipmt)
 
 
 //________________________________________________________________
-
+/*
 void AliT0CalibData::SetAmpLED(Int_t ipmt)
 {
   Float_t mv, ps; 
@@ -237,7 +250,7 @@ void AliT0CalibData::SetAmpLED(Int_t ipmt)
   fAmpLED.AddAtAndExpand(gr,ipmt);
    
 }
-
+*/
 //________________________________________________________________
 
 void AliT0CalibData::SetAmpLEDRec(Int_t ipmt)
@@ -283,25 +296,8 @@ void AliT0CalibData::ReadAsciiLookup(const Char_t *filename)
   lookup.open(filename);
   if(!lookup)
     {
-      //  AliLog(Form("Cannot open file %s ! Getting hardcoded value",filename));
-
-      //      fNumberOfTRMs = 2;
-      SetNumberOfTRMs(2);
-      trm=0; tdc=0; chain=0; channel=0; key=0;
-      for (Int_t ik=0; ik<108; ik++)
-       {
-         AliT0LookUpKey * lookkey= new AliT0LookUpKey();
-         AliT0LookUpValue * lookvalue= new AliT0LookUpValue();
-         
-         lookvalue->SetTRM(trm);
-         lookvalue->SetTDC(tdc);
-         lookvalue->SetChain(chain);
-         lookvalue->SetChannel(channel);
-         lookkey->SetKey(ik);
-         if(ik>53) { trm=1; tdc=0; channel=0;}
-         if (channel<7) channel +=2;
-         else {channel = 0; tdc++;}
-       }
+     AliError(Form("!!!!!!!!!!!!!!No look up table in CDB!" ));
+ 
     }
   Char_t varname[11];
   Int_t ntrms;
@@ -322,6 +318,7 @@ void AliT0CalibData::ReadAsciiLookup(const Char_t *filename)
          lookvalue->SetChain(chain);
          lookvalue->SetChannel(channel);
          lookkey->SetKey(key);
+         lookkey->SetChannelName(varname);
          cout<<"lookup "<<varname<<" "<<key<<" "<<trm<<" "<<chain<<" "<<tdc<<" "<<channel<<endl;         
          
          fLookup.Add((TObject*)lookvalue,(TObject*)lookkey);