]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
- Reading of packed TRAP config from raw data for full half-chamber
authorcblume <cblume@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 12 Mar 2010 20:29:33 +0000 (20:29 +0000)
committercblume <cblume@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 12 Mar 2010 20:29:33 +0000 (20:29 +0000)
- Storage of DMEM content in separate blocks according to
  different granularities, incl. PID LUT (Uwe)

TRD/AliTRDtrapConfig.cxx
TRD/AliTRDtrapConfig.h

index 937334357295f3fc4aab11c211bebe9b4df1362a..9764cf00a6f3080d3413b1c5fe168b60e7836f43 100644 (file)
@@ -477,6 +477,21 @@ AliTRDtrapConfig::AliTRDtrapConfig() :
   fRegs[kDMDELA]  =   SimpleReg_t("DMDELA",      0xD002, 4,      0x8        );
   fRegs[kDMDELS]  =   SimpleReg_t("DMDELS",      0xD003, 4,      0x8        );
 
+  // DMEM allocation
+  // to save space only allocated in groups of normally
+  // equal settings
+  fDmem[fgkDmemAddrDeflCorr - fgkDmemStartAddress]      = new UInt_t[5*6*8*16];
+  fDmem[fgkDmemAddrNdrift - fgkDmemStartAddress]        = new UInt_t[18*5*6];
+  for (Int_t iAddr = fgkDmemAddrDeflCutStart; iAddr <= fgkDmemAddrDeflCutEnd; iAddr++) {
+    fDmem[iAddr - fgkDmemStartAddress]        = new UInt_t[5*6*8*16];
+  }
+  for (Int_t iAddr = fgkDmemAddrLUTStart; iAddr <= fgkDmemAddrLUTEnd; iAddr++) {
+    fDmem[iAddr - fgkDmemStartAddress]        = new UInt_t;
+  }
+  for (Int_t iAddr = fgkDmemAddrTrackletStart; iAddr <= fgkDmemAddrTrackletEnd; iAddr++) {
+    fDmem[iAddr - fgkDmemStartAddress]        = new UInt_t[18*5*6*8*16];
+  }
+
   InitRegs();
 }
 
@@ -494,6 +509,22 @@ AliTRDtrapConfig* AliTRDtrapConfig::Instance()
 }
 
 
+AliTRDtrapConfig::~AliTRDtrapConfig()
+{
+  delete [] fDmem[fgkDmemAddrDeflCorr - fgkDmemStartAddress];
+  delete [] fDmem[fgkDmemAddrNdrift - fgkDmemStartAddress];
+  for (Int_t iAddr = fgkDmemAddrDeflCutStart; iAddr <= fgkDmemAddrDeflCutEnd; iAddr++) {
+    delete [] fDmem[iAddr - fgkDmemStartAddress];
+  }
+  for (Int_t iAddr = fgkDmemAddrLUTStart; iAddr <= fgkDmemAddrLUTEnd; iAddr++) {
+    delete fDmem[iAddr - fgkDmemStartAddress];
+  }
+  for (Int_t iAddr = fgkDmemAddrTrackletStart; iAddr <= fgkDmemAddrTrackletEnd; iAddr++) {
+    delete [] fDmem[iAddr - fgkDmemStartAddress];
+  }
+}
+
+
 void AliTRDtrapConfig::InitRegs(void)
 {
    // Reset the content of all TRAP registers to the reset values (see TRAP User Manual)
@@ -613,7 +644,8 @@ Bool_t AliTRDtrapConfig::SetTrapReg(TrapReg_t reg, Int_t value, Int_t det, Int_t
 {
   // set the value for the given TRAP register of an individual MCM 
 
-   //std::cout << "-- reg: 0x" << std::hex << fRegs[reg].addr << std::dec << ", data " << value << ", det " << det << ", rob " << rob << ", mcm " << mcm << std::endl;
+  //std::cout << "-- reg: 0x" << std::hex << fRegs[reg].addr << 
+  //std::dec << ", data " << value << ", det " << det << ", rob " << rob << ", mcm " << mcm << std::endl;
 
    if( (det >= 0 && det < AliTRDgeometry::Ndet()) && 
        (rob >= 0 && rob < AliTRDfeeParam::GetNrobC1()) && 
@@ -668,29 +700,33 @@ Int_t AliTRDtrapConfig::Peek(Int_t addr, Int_t /* det */, Int_t /* rob */, Int_t
 }
 
 
-Bool_t AliTRDtrapConfig::Poke(Int_t addr, Int_t value, Int_t /* det */, Int_t /* rob */, Int_t /* mcm */)
+Bool_t AliTRDtrapConfig::Poke(Int_t addr, Int_t value, Int_t det, Int_t rob, Int_t mcm)
 {
   // writing to given address
   // not to be used yet
 
   if ( (addr >= fgkDmemStartAddress) && 
        (addr < (fgkDmemStartAddress + fgkDmemWords)) ) {
-    printf("DMEM 0x%08x : %i\n", addr, value);
+    AliDebug(2, Form("DMEM 0x%08x : %i", addr, value));
+    SetDmem(addr, value, det, rob, mcm);
     return kTRUE;
   }
   else {
     TrapReg_t mcmReg = GetRegByAddress(addr);
     if ( mcmReg >= 0 && mcmReg < kLastReg) {
-      printf("Register: %s : %i\n", GetRegName(mcmReg), value);
+      AliDebug(2, Form("Register: %s : %i\n", GetRegName(mcmReg), value));
+      SetTrapReg(mcmReg, value, det, rob, mcm);
       return kTRUE;
     }
   }
+  
+  //AliError(Form("Unknown address 0x%08x!", addr));
 
   return kFALSE;
 }
 
 
-Bool_t AliTRDtrapConfig::SetDmem(Int_t addr, Int_t value)
+Bool_t AliTRDtrapConfig::SetDmem(Int_t addr, UInt_t value)
 {
   // Set the content of the given DMEM address 
 
@@ -699,48 +735,151 @@ Bool_t AliTRDtrapConfig::SetDmem(Int_t addr, Int_t value)
     return kFALSE;
   }
 
-  for (Int_t iDet = 0; iDet < 540; iDet++) {
-    for (Int_t iROB = 0; iROB < AliTRDfeeParam::GetNrobC1(); iROB++) {
-      for (Int_t iMCM = 0; iMCM < fgkMaxMcm; iMCM++) {
-        fDmem[iDet*AliTRDfeeParam::GetNrobC1()*fgkMaxMcm + iROB*fgkMaxMcm + iMCM]
-          [addr - fgkDmemStartAddress] = value;
+  if (addr == fgkDmemAddrDeflCorr) {
+    for (Int_t iDet = 0; iDet < 540; iDet++) {
+      for (Int_t iROB = 0; iROB < AliTRDfeeParam::GetNrobC1(); iROB++) {
+       for (Int_t iMCM = 0; iMCM < fgkMaxMcm; iMCM++) {
+         fDmem[addr - fgkDmemStartAddress][(iDet % 30)*8*16 + iROB*16 + iMCM] = value;
+       }
+      }
+    }
+  }
+  else if (addr == fgkDmemAddrNdrift) {
+    for (Int_t iDet = 0; iDet < 540; iDet++) {
+      fDmem[addr - fgkDmemStartAddress][iDet] = value;
+    }
+  }
+  else if (addr >= fgkDmemAddrDeflCutStart && addr <= fgkDmemAddrDeflCutEnd) {
+    for (Int_t iDet = 0; iDet < 540; iDet++) {
+      for (Int_t iROB = 0; iROB < AliTRDfeeParam::GetNrobC1(); iROB++) {
+       for (Int_t iMCM = 0; iMCM < fgkMaxMcm; iMCM++) {
+         fDmem[addr - fgkDmemStartAddress][(iDet % 30)*8*16 + iROB*16 + iMCM] = value;
+       }
+      }
+    }
+  }
+  else if (addr >= fgkDmemAddrLUTStart && addr <= fgkDmemAddrLUTEnd) {
+    fDmem[addr - fgkDmemStartAddress][0] = value;
+  }
+  else if (addr >= fgkDmemAddrTrackletStart && addr <= fgkDmemAddrTrackletEnd) {
+    for (Int_t iDet = 0; iDet < 540; iDet++) {
+      for (Int_t iROB = 0; iROB < AliTRDfeeParam::GetNrobC1(); iROB++) {
+       for (Int_t iMCM = 0; iMCM < fgkMaxMcm; iMCM++) {
+         fDmem[addr - fgkDmemStartAddress][iDet*8*16 + iROB*16 + iMCM] = value;
+       }
       }
     }
   }
+  else {
+    AliError(Form("Address 0x%04x not allocated in DMEM", addr));
+    return kFALSE;
+  }
+
   return kTRUE;
 }
 
 
-Bool_t AliTRDtrapConfig::SetDmem(Int_t addr, Int_t value, Int_t det)
+Bool_t AliTRDtrapConfig::SetDmem(Int_t addr, UInt_t value, Int_t det)
 {
   // Set the content of the given DMEM address 
 
-  for (Int_t iROB = 0; iROB < AliTRDfeeParam::GetNrobC1(); iROB++) {
-    for (Int_t iMCM = 0; iMCM < fgkMaxMcm; iMCM++) {
-      fDmem[det*AliTRDfeeParam::GetNrobC1()*fgkMaxMcm + iROB*fgkMaxMcm + iMCM]
-        [addr - fgkDmemStartAddress] = value;
+  if ( (addr >> 14) != 0x3) {
+    AliError(Form("No DMEM address: 0x%08x", addr));
+    return kFALSE;
+  }
+
+  if (addr == fgkDmemAddrDeflCorr) {
+    for (Int_t iROB = 0; iROB < AliTRDfeeParam::GetNrobC1(); iROB++) {
+      for (Int_t iMCM = 0; iMCM < fgkMaxMcm; iMCM++) {
+       fDmem[addr - fgkDmemStartAddress][(det % 30)*8*16 + iROB*16 + iMCM] = value;
+      }
     }
   }
+  else if (addr == fgkDmemAddrNdrift) {
+    fDmem[addr - fgkDmemStartAddress][det] = value;
+  }
+  else if (addr >= fgkDmemAddrDeflCutStart && addr <= fgkDmemAddrDeflCutEnd) {
+    for (Int_t iROB = 0; iROB < AliTRDfeeParam::GetNrobC1(); iROB++) {
+      for (Int_t iMCM = 0; iMCM < fgkMaxMcm; iMCM++) {
+       fDmem[addr - fgkDmemStartAddress][(det % 30)*8*16 + iROB*16 + iMCM] = value;
+      }
+    }
+  }
+  else if (addr >= fgkDmemAddrLUTStart && addr <= fgkDmemAddrLUTEnd) {
+    fDmem[addr - fgkDmemStartAddress][0] = value;
+  }
+  else if (addr >= fgkDmemAddrTrackletStart && addr <= fgkDmemAddrTrackletEnd) {
+    for (Int_t iROB = 0; iROB < AliTRDfeeParam::GetNrobC1(); iROB++) {
+      for (Int_t iMCM = 0; iMCM < fgkMaxMcm; iMCM++) {
+       fDmem[addr - fgkDmemStartAddress][det*8*16 + iROB*16 + iMCM] = value;
+      }
+    }
+  }
+  else {
+    AliError(Form("Address 0x%04x not allocated in DMEM", addr));
+    return kFALSE;
+  }
+
   return kTRUE;
 }
 
 
-Bool_t AliTRDtrapConfig::SetDmem(Int_t addr, Int_t value, Int_t det, Int_t rob, Int_t mcm)
+Bool_t AliTRDtrapConfig::SetDmem(Int_t addr, UInt_t value, Int_t det, Int_t rob, Int_t mcm)
 {
   // Set the content of the given DMEM address 
 
-  fDmem[det*AliTRDfeeParam::GetNrobC1()*fgkMaxMcm + rob*fgkMaxMcm + mcm]
-    [addr - fgkDmemStartAddress] = value;
+  if ( (addr >> 14) != 0x3) {
+    AliError(Form("Not a DMEM address: 0x%08x", addr));
+    return kFALSE;
+  }
+
+  if (addr == fgkDmemAddrDeflCorr) {
+    fDmem[addr - fgkDmemStartAddress][(det % 30)*8*16 + rob*16 + mcm] = value;
+  }
+  else if (addr == fgkDmemAddrNdrift) {
+    fDmem[addr - fgkDmemStartAddress][det] = value;
+  }
+  else if (addr >= fgkDmemAddrDeflCutStart && addr <= fgkDmemAddrDeflCutEnd) {
+    fDmem[addr - fgkDmemStartAddress][(det % 30)*8*16 + rob*16 + mcm] = value;
+  }
+  else if (addr >= fgkDmemAddrLUTStart && addr <= fgkDmemAddrLUTEnd) {
+    fDmem[addr - fgkDmemStartAddress][0] = value;
+  }
+  else if (addr >= fgkDmemAddrTrackletStart && addr <= fgkDmemAddrTrackletEnd) {
+    fDmem[addr - fgkDmemStartAddress][det*8*16 + rob*16 + mcm] = value;
+  }
+  else {
+    AliError(Form("Address 0x%04x not allocated in DMEM", addr));
+    return kFALSE;
+  }
+
   return kTRUE;
 }
 
 
-Int_t AliTRDtrapConfig::GetDmem(Int_t addr, Int_t det, Int_t rob, Int_t mcm)
+UInt_t AliTRDtrapConfig::GetDmemUnsigned(Int_t addr, Int_t det, Int_t rob, Int_t mcm)
 {
-  // Set the content of the given DMEM address 
+  // Get the content of the given DMEM address 
 
-  return fDmem[det*AliTRDfeeParam::GetNrobC1()*fgkMaxMcm + rob*fgkMaxMcm + mcm]
-    [addr - fgkDmemStartAddress];
+  if (addr == fgkDmemAddrDeflCorr) {
+    return fDmem[addr - fgkDmemStartAddress][(det % 30)*8*16 + rob*16 + mcm];
+  }
+  else if (addr == fgkDmemAddrNdrift) {
+    return fDmem[addr - fgkDmemStartAddress][det];
+  }
+  else if (addr >= fgkDmemAddrDeflCutStart && addr <= fgkDmemAddrDeflCutEnd) {
+    return fDmem[addr - fgkDmemStartAddress][(det % 30)*8*16 + rob*16 + mcm];
+  }
+  else if (addr >= fgkDmemAddrLUTStart && addr <= fgkDmemAddrLUTEnd) {
+    return fDmem[addr - fgkDmemStartAddress][0];
+  }
+  else if (addr >= fgkDmemAddrTrackletStart && addr <= fgkDmemAddrTrackletEnd) {
+    return fDmem[addr - fgkDmemStartAddress][det*8*16 + rob*16 + mcm];
+  }
+  else {
+    AliError(Form("Address 0x%04x not allocated in DMEM", addr));
+    return 0;
+  }
 }
 
 
@@ -867,13 +1006,17 @@ Bool_t  AliTRDtrapConfig::LoadConfig(Int_t det, TString filename)
 }
 
 
-Bool_t AliTRDtrapConfig::ReadPackedConfig(UInt_t *data, Int_t size) 
+Bool_t AliTRDtrapConfig::ReadPackedConfig(Int_t hc, UInt_t *data, Int_t size) 
 {
   // Read the packed configuration from the passed memory block
   //
   // To be used to retrieve the TRAP configuration from the 
   // configuration as sent in the raw data. 
 
+  AliDebug(1, "Reading packed configuration");
+
+  Int_t det = hc/2;
+
   Int_t idx = 0;
   Int_t err = 0;
   Int_t step, bwidth, nwords, exitFlag, bitcnt;
@@ -881,122 +1024,131 @@ Bool_t AliTRDtrapConfig::ReadPackedConfig(UInt_t *data, Int_t size)
   UShort_t caddr;
   UInt_t dat, msk, header, dataHi;
   
-  while (idx < size) {
+  while (idx < size && *data != 0x00000000) {
     
-    header = *data;
+    Int_t rob = (*data >> 28) & 0x7;
+    Int_t mcm = (*data >> 24) & 0xf;
+
+    AliDebug(1, Form("Config of det. %3i MCM %i:%02i (0x%08x)", det, rob, mcm, *data));
     data++;
-    idx++;
-    
-    AliDebug(5, Form("read: 0x%08x", header));
     
-    if (header & 0x01) // single data                                                                                                                                                                         
-    {
-      dat   = (header >>  2) & 0xFFFF;       // 16 bit data                                                                                                                                                    
-      caddr = (header >> 18) & 0x3FFF;    // 14 bit address                                                                                                                                                 
+    while (idx < size && *data != 0x00000000) {
       
-      if (caddr != 0x1FFF)  // temp!!! because the end marker was wrong                                                                                                                                     
-      {
-        if (header & 0x02) // check if > 16 bits                                                                                                                                                              
-        {
-          dataHi = *data;
-          AliDebug(5, Form("read: 0x%08x", dataHi));
-          data++;
-          idx++;
-          err += ((dataHi ^ (dat | 1)) & 0xFFFF) != 0;
-          dat = (dataHi & 0xFFFF0000) | dat;
-        }
-        AliDebug(5, Form("addr=0x%04x (%s) data=0x%08x\n", caddr, GetRegName(GetRegByAddress(caddr)), dat));
-        if ( ! Poke(caddr, dat, 0, 0, 0) )
-          AliDebug(5, Form("(single-write): non-existing address 0x%04x containing 0x%08x\n", caddr, header));
-        if (idx > size)
-        {
-          AliDebug(5, Form("(single-write): no more data, missing end marker\n"));
-          return -err;
-        }
-      }
-      else
-      {
-        AliDebug(5, Form("(single-write): address 0x%04x => old endmarker?\n", caddr));
-        return err;
-      }
-    }
-    
-    else               // block of data                                                                                                                                                                       
-    {
-      step   =  (header >>  1) & 0x0003;
-      bwidth = ((header >>  3) & 0x001F) + 1;
-      nwords =  (header >>  8) & 0x00FF;
-      caddr  =  (header >> 16) & 0xFFFF;
-      exitFlag = (step == 0) || (step == 3) || (nwords == 0);
+      header = *data;
+      data++;
+      idx++;
       
-      if (exitFlag) 
-        return err;
+      AliDebug(5, Form("read: 0x%08x", header));
       
-      switch (bwidth)
-      {
-          case    15:
-          case    10:
-          case     7:
-          case     6:
-          case     5:
-          {
-            msk = (1 << bwidth) - 1;
-            bitcnt = 0;
-            while (nwords > 0)
-            {
-              nwords--;
-              bitcnt -= bwidth;
-              if (bitcnt < 0)
-              {
-                header = *data;
-                AliDebug(5, Form("read 0x%08x", header));
-                data++;
-                idx++;
-                err += (header & 1);
-                header = header >> 1;
-                bitcnt = 31 - bwidth;
-              }
-              AliDebug(5, Form("addr=0x%04x (%s) data=0x%08x\n", caddr, GetRegName(GetRegByAddress(caddr)), header & msk));
-              if ( ! Poke(caddr, header & msk, 0, 0, 0) )
-                AliDebug(5, Form("(single-write): non-existing address 0x%04x containing 0x%08x\n", caddr, header));
-              
-              caddr += step;
-              header = header >> bwidth;
-              if (idx >= size)
-              {
-                AliDebug(5, Form("(block-write): no end marker! %d words read\n", idx));
-                return -err;
-              }
-            }
-            break;
-          } // end case 5-15                                         
-          case 31:
-          {
-            while (nwords > 0)
-            {
-              header = *data;
-              AliDebug(5, Form("read 0x%08x", header));
-              data++;
-              idx++;
-              nwords--;
-              err += (header & 1);
-
-              AliDebug(5, Form("addr=0x%04x (%s) data=0x%08x", caddr, GetRegName(GetRegByAddress(caddr)), header >> 1));
-              if ( ! Poke(caddr, header >> 1, 0, 0, 0) )
-                AliDebug(5, Form("(single-write): non-existing address 0x%04x containing 0x%08x\n", caddr, header));
-              
-              caddr += step;
-              if (idx >= size)
-              {
-                AliDebug(5, Form("no end marker! %d words read", idx));
-                return -err;
-              }
-            }
-            break;
-          }
-          default: return err;
-      } // end switch                                                                                                                                                                                       
-    } // end block case                                                                                                                                                                                       
+      if (header & 0x01) // single data                                                                                                                                                                         
+       {
+         dat   = (header >>  2) & 0xFFFF;       // 16 bit data                                                                                                                                                    
+         caddr = (header >> 18) & 0x3FFF;    // 14 bit address                                                                                                                                                 
+         
+         if (caddr != 0x1FFF)  // temp!!! because the end marker was wrong                                                                                                                                     
+           {
+             if (header & 0x02) // check if > 16 bits                                                                                                                                                              
+               {
+                 dataHi = *data;
+                 AliDebug(5, Form("read: 0x%08x", dataHi));
+                 data++;
+                 idx++;
+                 err += ((dataHi ^ (dat | 1)) & 0xFFFF) != 0;
+                 dat = (dataHi & 0xFFFF0000) | dat;
+               }
+             AliDebug(5, Form("addr=0x%04x (%s) data=0x%08x\n", caddr, GetRegName(GetRegByAddress(caddr)), dat));
+             if ( ! Poke(caddr, dat, det, rob, mcm) )
+               AliDebug(5, Form("(single-write): non-existing address 0x%04x containing 0x%08x\n", caddr, header));
+             if (idx > size)
+               {
+                 AliDebug(5, Form("(single-write): no more data, missing end marker\n"));
+                 return -err;
+               }
+           }
+         else
+           {
+             AliDebug(5, Form("(single-write): address 0x%04x => old endmarker?\n", caddr));
+             return err;
+           }
+       }
+      
+      else               // block of data                                                                                                                                                                       
+       {
+         step   =  (header >>  1) & 0x0003;
+         bwidth = ((header >>  3) & 0x001F) + 1;
+         nwords =  (header >>  8) & 0x00FF;
+         caddr  =  (header >> 16) & 0xFFFF;
+         exitFlag = (step == 0) || (step == 3) || (nwords == 0);
+         
+         if (exitFlag) 
+           break;
+         
+         switch (bwidth)
+           {
+           case    15:
+           case    10:
+           case     7:
+           case     6:
+           case     5:
+             {
+               msk = (1 << bwidth) - 1;
+               bitcnt = 0;
+               while (nwords > 0)
+                 {
+                   nwords--;
+                   bitcnt -= bwidth;
+                   if (bitcnt < 0)
+                     {
+                       header = *data;
+                       AliDebug(5, Form("read 0x%08x", header));
+                       data++;
+                       idx++;
+                       err += (header & 1);
+                       header = header >> 1;
+                       bitcnt = 31 - bwidth;
+                     }
+                   AliDebug(5, Form("addr=0x%04x (%s) data=0x%08x\n", caddr, GetRegName(GetRegByAddress(caddr)), header & msk));
+                   if ( ! Poke(caddr, header & msk, det, rob, mcm) )
+                     AliDebug(5, Form("(single-write): non-existing address 0x%04x containing 0x%08x\n", caddr, header));
+                   
+                   caddr += step;
+                   header = header >> bwidth;
+                   if (idx >= size)
+                     {
+                       AliDebug(5, Form("(block-write): no end marker! %d words read\n", idx));
+                       return -err;
+                     }
+                 }
+               break;
+             } // end case 5-15                                         
+           case 31:
+             {
+               while (nwords > 0)
+                 {
+                   header = *data;
+                   AliDebug(5, Form("read 0x%08x", header));
+                   data++;
+                   idx++;
+                   nwords--;
+                   err += (header & 1);
+                   
+                   AliDebug(5, Form("addr=0x%04x (%s) data=0x%08x", caddr, GetRegName(GetRegByAddress(caddr)), header >> 1));
+                   if ( ! Poke(caddr, header >> 1, det, rob, mcm) )
+                     AliDebug(5, Form("(single-write): non-existing address 0x%04x containing 0x%08x\n", caddr, header));
+                   
+                   caddr += step;
+                   if (idx >= size)
+                     {
+                       AliDebug(5, Form("no end marker! %d words read", idx));
+                       return -err;
+                     }
+                 }
+               break;
+             }
+           default: return err;
+           } // end switch                                                                                                                                                                                       
+       } // end block case                                                                                                                                                                                       
+    }
   } // end while                                                                                                                                                                                                
   AliDebug(5, Form("no end marker! %d words read", idx));
   return -err; // only if the max length of the block reached!                       
@@ -1232,5 +1384,3 @@ AliTRDtrapConfig::TrapReg_t AliTRDtrapConfig::GetRegByAddress(Int_t address) con
 
   return mcmReg;
 }
-
-
index 5dca27cdf4af272b9f23f83d25f3916e2ed0fa65..13ea1b6b9bde38a46efaf0892cb8a3b399b9247f 100644 (file)
@@ -15,6 +15,8 @@
 class AliTRDtrapConfig : public TObject
 {
  public:
+  ~AliTRDtrapConfig(); 
+
   static AliTRDtrapConfig* Instance();
 
   enum TrapReg_t { kSML0, 
@@ -452,10 +454,10 @@ class AliTRDtrapConfig : public TObject
                  kDMDELS,      
                  kLastReg };   // enum of all TRAP registers, to be used for access to them
 
-  const char* GetRegName(TrapReg_t reg)       const { return fRegs[reg].fName.Data(); }
-  UShort_t    GetRegAddress(TrapReg_t reg)    const { return fRegs[reg].fAddr; }
-  UShort_t    GetRegNBits(TrapReg_t reg)      const { return fRegs[reg].fNbits; }
-  UInt_t      GetRegResetValue(TrapReg_t reg) const { return fRegs[reg].fResetValue; }
+  const char* GetRegName(TrapReg_t reg)       const { return reg >= 0 && reg < kLastReg ? fRegs[reg].fName.Data() : ""; }
+  UShort_t    GetRegAddress(TrapReg_t reg)    const { return reg >= 0 && reg < kLastReg ? fRegs[reg].fAddr : 0; }
+  UShort_t    GetRegNBits(TrapReg_t reg)      const { return reg >= 0 && reg < kLastReg ? fRegs[reg].fNbits : 0; }
+  UInt_t      GetRegResetValue(TrapReg_t reg) const { return reg >= 0 && reg < kLastReg ? fRegs[reg].fResetValue : 0; }
 
   TrapReg_t          GetRegByAddress(Int_t address) const;
 
@@ -474,20 +476,42 @@ class AliTRDtrapConfig : public TObject
   void ResetRegs();
 
   // DMEM 
-  Bool_t SetDmem(Int_t addr, Int_t value);
-  Bool_t SetDmem(Int_t addr, Int_t value, Int_t det);
-  Bool_t SetDmem(Int_t addr, Int_t value, Int_t det, Int_t rob, Int_t mcm);
+  Bool_t SetDmem(Int_t addr, UInt_t value);
+  Bool_t SetDmem(Int_t addr, UInt_t value, Int_t det);
+  Bool_t SetDmem(Int_t addr, UInt_t value, Int_t det, Int_t rob, Int_t mcm);
+  Bool_t SetDmem(Int_t addr, Int_t value) { return SetDmem(addr, (UInt_t) value); }
+  Bool_t SetDmem(Int_t addr, Int_t value, Int_t det) { return SetDmem(addr, (UInt_t) value, det); }
+  Bool_t SetDmem(Int_t addr, Int_t value, Int_t det, Int_t rob, Int_t mcm) { return SetDmem(addr, (UInt_t) value, det, rob, mcm); }
 
-  Int_t GetDmem(Int_t addr, Int_t det, Int_t rob, Int_t mcm);
+  Int_t  GetDmem(Int_t addr, Int_t det, Int_t rob, Int_t mcm) { return GetDmemSigned(addr, det, rob, mcm); } 
+  Int_t  GetDmemSigned(Int_t addr, Int_t det, Int_t rob, Int_t mcm) { return (Int_t) GetDmemUnsigned(addr, det, rob, mcm); } 
+  UInt_t GetDmemUnsigned(Int_t addr, Int_t det, Int_t rob, Int_t mcm);
 
   // configuration handling
   Bool_t LoadConfig();
   Bool_t LoadConfig(Int_t det, TString filename);
 
-  Bool_t ReadPackedConfig(UInt_t *data, Int_t size);
+  Bool_t ReadPackedConfig(Int_t det, UInt_t *data, Int_t size);
 
   Int_t  ExtAliToAli( UInt_t dest, UShort_t linkpair, UShort_t rocType);
 
+  // DMEM addresses
+  static const Int_t fgkDmemAddrLUTcor0       = 0xC02A;
+  static const Int_t fgkDmemAddrLUTcor1       = 0xC028;
+  static const Int_t fgkDmemAddrLUTnbins      = 0xC029;
+                                             
+  static const Int_t fgkDmemAddrLUTStart      = 0xC100; // LUT start address
+  static const Int_t fgkDmemAddrLUTEnd        = 0xC3FF; // maximum possible end address for the LUT table
+  static const Int_t fgkDmemAddrLUTLength     = 0xC02B; // address where real size of the LUT table is stored
+                                             
+  static const Int_t fgkDmemAddrTrackletStart = 0xC0E0; // Storage area for tracklets, start address
+  static const Int_t fgkDmemAddrTrackletEnd   = 0xC0E3; // Storage area for tracklets, end address
+
+  static const Int_t fgkDmemAddrDeflCorr      = 0xc022; // DMEM address of deflection correction
+  static const Int_t fgkDmemAddrNdrift        = 0xc025; // DMEM address of Ndrift
+  static const Int_t fgkDmemAddrDeflCutStart  = 0xc030; // DMEM start address of deflection cut 
+  static const Int_t fgkDmemAddrDeflCutEnd    = 0xc055; // DMEM end address of deflection cut
+
  protected:
   static AliTRDtrapConfig *fgInstance;  // pointer to instance (singleton)
 
@@ -530,8 +554,8 @@ class AliTRDtrapConfig : public TObject
   // DMEM
   static const Int_t fgkDmemStartAddress; // = 0xc000;  // start address in TRAP GIO
   static const Int_t fgkDmemWords = 0x400;          // number of words in DMEM
-  UInt_t fDmem[540*8*18][fgkDmemWords]; // DMEM storage
-  Bool_t fDmemValid[540*8*18][fgkDmemWords]; // DMEM valid flag storage
+  UInt_t* fDmem[fgkDmemWords]; // DMEM storage
+  //  Bool_t* fDmemValid[fgkDmemWords]; // DMEM valid flag storage
 
   AliTRDtrapConfig(); // private constructor due to singleton implementation