X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=FMD%2FAliFMDRawReader.cxx;h=bed80daa311444a0301ba166d982519b07da33fa;hb=bd8f72a41f7bfb5212166b9b8b7e33a8f52977d5;hp=2ae938f4bc3a89280a5390aae482114b2057f47e;hpb=76d06ffac6d7ececeeb06acd9d98f81e19f9cfde;p=u%2Fmrichter%2FAliRoot.git diff --git a/FMD/AliFMDRawReader.cxx b/FMD/AliFMDRawReader.cxx index 2ae938f4bc3..bed80daa311 100644 --- a/FMD/AliFMDRawReader.cxx +++ b/FMD/AliFMDRawReader.cxx @@ -50,18 +50,22 @@ #include "AliFMDDebug.h" // Better debug macros #include "AliFMDParameters.h" // ALIFMDPARAMETERS_H #include "AliFMDDigit.h" // ALIFMDDIGIT_H -#include "AliFMDRawStream.h" // ALIFMDRAWSTREAM_H +#include "AliFMDSDigit.h" // ALIFMDSDIGIT_H +// #include "AliFMDRawStream.h" // ALIFMDRAWSTREAM_H #include "AliRawReader.h" // ALIRAWREADER_H #include "AliFMDRawReader.h" // ALIFMDRAWREADER_H #include "AliFMDDebug.h" #include "AliFMDCalibSampleRate.h" #include "AliFMDCalibStripRange.h" +#include "AliFMDAltroMapping.h" // #include "AliFMDAltroIO.h" // ALIFMDALTROIO_H +#include "AliAltroRawStreamV3.h" #include // ROOT_TArrayS #include // ROOT_TTree #include // ROOT_TClonesArray #include - #include +#include +#include // #include //____________________________________________________________________ @@ -75,11 +79,20 @@ AliFMDRawReader::AliFMDRawReader(AliRawReader* reader, TTree* tree) : TTask("FMDRawReader", "Reader of Raw ADC values from the FMD"), fTree(tree), fReader(reader), - fSampleRate(1), + // fSampleRate(1), fData(0), - fNbytes(0) + fNbytes(0), + fMinStrip(0), + fMaxStrip(127), + fPreSamp(14+5), + fSeen(0) { // Default CTOR + for (Int_t i = 0; i < 3; i++) { + fSampleRate[i] = 0; + fZeroSuppress[i] = kFALSE; + fNoiseFactor[i] = 1; + } } //____________________________________________________________________ @@ -99,289 +112,438 @@ AliFMDRawReader::Exec(Option_t*) Int_t nWrite = fTree->Fill(); AliFMDDebug(1, ("Got a grand total of %d digits, wrote %d bytes to tree", array->GetEntriesFast(), nWrite)); + delete array; } +//____________________________________________________________________ +Int_t +AliFMDRawReader::NewDDL(AliAltroRawStreamV3& input, UShort_t& det) +{ + // Process a new DDL. Sets the internal data members fZeroSuppress, + // fSampleRate, and fNoiseFactor based on information in the RCU trailer. + // + // Parameters: + // input Input stream + // det On return, the detector number + // + // Return value: + // negative value in case of problems, the DDL number otherwise + + // Get the DDL number + UInt_t ddl = input.GetDDLNumber(); + AliFMDDebug(2, ("DDL number %d", ddl)); + + /* Note, previously, the ALTROCFG1 register was interpreted as + * + * Bits Value Description + * 0- 3 0/1 1st Baseline filter, mode + * 4- 5 Over-1 2nd baseline filter, # of pre-samples + * 6- 9 factor 2nd baseline filter, # of post-samples + * 10- 0 2nd baseline filter, enable + * 11-12 00 Zero suppression, glitch filter mode + * 13-15 001 Zero suppression, # of post samples + * 16-17 01 Zero suppression, # of pre samples + * 18 0/1 Zero suppression, enable + * + * The interpretation used in AliAltroRawStreamerV3 - which + * corresponds directly to ALTRO DPCFG register - is + * + * Bits Value Description + * 0- 3 0/1 1st Baseline filter, mode + * 4 0 Polarity (if '1', then "1's inverse") + * 5- 6 01 Zero suppression, # of pre samples + * 7-10 0001 Zero suppression, # of post samples + * 11 0 2nd baseline filter, enable + * 12-13 00 Zero suppression, glitch filter mode + * 14-16 factor 2nd baseline filter, # of post-samples + * 17-18 01 2nd baseline filter, # of pre-samples + * 19 0/1 Zero suppression, enable + * + * Writing 'x' for variable values, that means we have the + * following patterns for the 2 cases + * + * bit # 20 16 12 8 4 0 + * old |0x01|0010|00xx|xxxx|xxxx| + * new |x01x|xx00|0000|1010|xxxx| + * + * That means that we can check if bits 10-13 are '1000' or + * '0000', which will tell us if the value was written with the + * new or the old interpretation. That is, we can check that + * + * if (((altrocfg1 >> 10) & 0x8) == 0x8) { + * // old interpretation + * } + * else { + * // New interpretation + * } + * + * That means, that we should never + * + * - change the # of zero suppression post samples + * - Turn on 2nd baseline correction + * - Change the zero-suppression glitch filter mode + * + * This change as introduced in version 1.2 of Rcu++ + */ + UInt_t cfg1 = input.GetAltroCFG1(); + if (((cfg1 >> 10) & 0x8) == 0x8) { + UInt_t cfg2 = input.GetAltroCFG2(); + AliFMDDebug(3, ("We have data from older MiniConf 0x%x cfg2=0x%08x", + ((cfg1 >> 10) & 0x8), cfg2)); + fZeroSuppress[ddl] = (cfg1 >> 0) & 0x1; + fNoiseFactor[ddl] = (cfg1 >> 6) & 0xF; + fSampleRate[ddl] = (cfg2 >> 20) & 0xF; + } + else { + AliFMDDebug(3, ("We have data from newer MiniConf 0x%x", + ((cfg1 >> 10) & 0x8))); + fZeroSuppress[ddl] = input.GetZeroSupp(); + // WARNING: We store the noise factor in the 2nd baseline + // filters excluded post samples, since we'll never use that + // mode. + fNoiseFactor[ddl] = input.GetNPostsamples(); + // WARNING: We store the sample rate in the number of pre-trigger + // samples, since we'll never use that mode. + fSampleRate[ddl] = input.GetNPretriggerSamples(); + } + AliFMDDebug(3, ("RCU @ DDL %d zero suppression: %s", + ddl, (fZeroSuppress[ddl] ? "yes" : "no"))); + AliFMDDebug(3, ("RCU @ DDL %d noise factor: %d", ddl,fNoiseFactor[ddl])); + AliFMDDebug(3, ("RCU @ DDL %d sample rate: %d", ddl,fSampleRate[ddl])); + + + // Get Errors seen + Int_t nChAddrMismatch = input.GetNChAddrMismatch(); + Int_t nChLenMismatch = input.GetNChLengthMismatch(); + if (nChAddrMismatch != 0) + AliWarning(Form("Got %d channels with address mis-matches for 0x%03x", + nChAddrMismatch, ddl)); + if (nChLenMismatch != 0) + AliWarning(Form("Got %d channels with length mis-matches for 0x%03x", + nChLenMismatch, ddl)); + + // Map DDL number to the detector number + AliFMDParameters* pars = AliFMDParameters::Instance(); + AliFMDAltroMapping* map = pars->GetAltroMap(); + if (map->DDL2Detector(ddl) < 0) return -1; + det = map->DDL2Detector(ddl); + + if (AliLog::GetDebugLevel("FMD", 0) > 5) + input.PrintRCUTrailer(); + return ddl; +} -#if 1 //____________________________________________________________________ -Bool_t -AliFMDRawReader::ReadAdcs(TClonesArray* array) +Int_t +AliFMDRawReader::NewChannel(AliAltroRawStreamV3& input, UShort_t det, + Char_t& ring, UShort_t& sec, Short_t& strbase) { + // Processs a new channel. Sets the internal data members + // fMinStrip, fMaxStrip, and fPreSamp. + // + // Parameter: + // input Input stream + // ring On return, the ring identifier + // sec On return, the sector number + // strbase On return, the strip base + // + // Return value + // negative value in case of problems, hardware address otherwise - // Read raw data into the digits array, using AliFMDAltroReader. - if (!array) { - AliError("No TClonesArray passed"); - return kFALSE; + // Get the hardware address, and map that to detector coordinates + UShort_t board, chip, channel; + Int_t ddl = input.GetDDLNumber(); + Int_t hwaddr = input.GetHWAddress(); + if (input.IsChannelBad()) { + AliError(Form("Channel 0x%03x is marked as bad!", hwaddr)); } - // if (!fReader->ReadHeader()) { - // AliError("Couldn't read header"); - // return kFALSE; - // } - // Get sample rate - AliFMDParameters* pars = AliFMDParameters::Instance(); - AliFMDRawStream input(fReader); - AliFMDDebug(5, ("Setting 7 word headers")); - input.SetShortDataHeader(!pars->HasCompleteHeader()); - - UShort_t stripMin = 0; - UShort_t stripMax = 127; - UShort_t preSamp = 14+5; - UInt_t ddl = 0; - UInt_t rate = 0; - UInt_t last = 0; - UInt_t hwaddr = 0; - // Data array is approx twice the size needed. - UShort_t data[2048]; - - Bool_t isGood = kTRUE; - while (isGood) { - isGood = input.ReadChannel(ddl, hwaddr, last, data); - if (!isGood) break; - - AliFMDDebug(5, ("Read channel 0x%x of size %d", hwaddr, last)); - UShort_t det, sec, str; - Char_t ring; - if (!pars->Hardware2Detector(ddl, hwaddr, det, ring, sec, str)) { - AliError(Form("Failed to get detector id from DDL %d " - "and hardware address 0x%x", ddl, hwaddr)); - continue; - } - rate = pars->GetSampleRate(det, ring, sec, str); - stripMin = pars->GetMinStrip(det, ring, sec, str); - stripMax = pars->GetMaxStrip(det, ring, sec, str); - preSamp = pars->GetPreSamples(det, ring, sec, str); - AliFMDDebug(5, ("DDL 0x%04x, address 0x%03x maps to FMD%d%c[%2d,%3d]", - ddl, hwaddr, det, ring, sec, str)); - - // Loop over the `timebins', and make the digits - for (size_t i = 0; i < last; i++) { - if (i < preSamp) continue; - Int_t n = array->GetEntriesFast(); - Short_t curStr = str + stripMin + (i-preSamp) / rate; - if ((curStr-str) > stripMax) { - // AliInfo(Form("timebin %4d -> (%3d+%3d+(%4d-%d)/%d) -> %d", - // i, str, stripMin, i, preSamp, rate, curStr)); - // AliError(Form("Current strip is %3d (0x%04x,0x%03x,%4d) " - // "but DB says max is %3d (rate=%d)", - // curStr, ddl, hwaddr, i, str+stripMax, rate)); - // Garbage timebins - ignore - continue; - } - AliFMDDebug(5, ("making digit for FMD%d%c[%2d,%3d] from sample %4d", - det, ring, sec, curStr, i)); - new ((*array)[n]) AliFMDDigit(det, ring, sec, curStr, data[i], - (rate >= 2 ? data[i+1] : 0), - (rate >= 3 ? data[i+2] : 0), - (rate >= 4 ? data[i+3] : 0)); - if (rate >= 2) i++; - if (rate >= 3) i++; - if (rate >= 4) i++; - } + AliFMDParameters* pars = AliFMDParameters::Instance(); + AliFMDAltroMapping* map = pars->GetAltroMap(); + // Map to hardware stuff + map->ChannelAddress(hwaddr, board, chip, channel); + // Then try to map to detector address + if (!map->Channel2StripBase(board, chip, channel, ring, sec, strbase)) { + AliError(Form("Failed to get detector id from DDL %d, " + "hardware address 0x%03x", ddl, hwaddr)); + return -1; } - return kTRUE; + AliFMDDebug(4, ("Board: 0x%02x, Altro: 0x%x, Channel: 0x%x", + board, chip, channel)); + + // Get the 'conditions' + fMinStrip = pars->GetMinStrip(det, ring, sec, strbase); + fMaxStrip = pars->GetMaxStrip(det, ring, sec, strbase); + fPreSamp = pars->GetPreSamples(det, ring, sec, strbase); + if (fSampleRate[ddl] == 0) + fSampleRate[ddl] = pars->GetSampleRate(det, ring, sec, strbase); + + return hwaddr; } -#else + +//____________________________________________________________________ +Int_t +AliFMDRawReader::NewSample(AliAltroRawStreamV3& input, + Int_t i, UShort_t t, UShort_t sec, + UShort_t strbase, Short_t& str, UShort_t& samp) +{ + // Process a new timebin + // + // Parameters: + // input Input stream + // i Index into bunch data + // t Time + // strbase Base of strip numbers for this channel + // str On return, the strip number + // samp On return, the sample number + // + // Return value + // negative value in case of problems, ADC value otherwise + if (t < fPreSamp) return -1; + + Int_t ddl = input.GetDDLNumber(); + Int_t hwa = input.GetHWAddress(); + const UShort_t* data = input.GetSignals(); + Short_t adc = data[i]; + AliFMDDebug(10, ("0x%04x/0x%03x/%04d %4d", ddl, hwa, t, adc)); + + AliFMDParameters* pars = AliFMDParameters::Instance(); + AliFMDAltroMapping* map = pars->GetAltroMap(); + + samp = 0; + Short_t stroff = 0; + map->Timebin2Strip(sec, t, fPreSamp, fSampleRate[ddl], stroff, samp); + str = strbase + stroff; + + AliFMDDebug(20, ("0x%04x/0x%03x/%04d=%4d maps to strip %3d sample %d " + "(pre: %d, min: %d, max: %d, rate: %d)", + ddl, hwa, t, adc, str, samp, fPreSamp, + fMinStrip, fMaxStrip, fSampleRate[ddl])); + if (str < 0) { + AliFMDDebug(10, ("Got presamples at timebin %d", i)); + return -1; + } + + // VA1 Local strip number + Short_t lstrip = (t - fPreSamp) / fSampleRate[ddl] + fMinStrip; + + AliFMDDebug(15, ("Checking if strip %d (%d) in range [%d,%d]", + lstrip, str, fMinStrip, fMaxStrip)); + if (lstrip < fMinStrip || lstrip > fMaxStrip) { + AliFMDDebug(10, ("Strip %03d-%d (%d,%d) from t=%d out of range (%3d->%3d)", + str, samp, lstrip, stroff, t, fMinStrip, fMaxStrip)); + adc = -1; + } + // Possibly do pedestal subtraction of signal + if (adc > 1023) + AliWarning(Form("ADC value out of range: %4d", adc)); + return adc; +} + //____________________________________________________________________ Bool_t -AliFMDRawReader::ReadAdcs(TClonesArray* array) +AliFMDRawReader::NextSample(UShort_t& det, Char_t& rng, UShort_t& sec, + UShort_t& str, UShort_t& sam, UShort_t& rat, + Short_t& adc, Bool_t& zs, UShort_t& fac) { - // Read raw data into the digits array, using AliFMDAltroReader. - if (!array) { - AliError("No TClonesArray passed"); - return kFALSE; + // Scan current event for next signal. It returns kFALSE when + // there's no more data in the event. + static AliAltroRawStreamV3 stream(fReader); // = 0; + static Int_t ddl = -1; + static UShort_t tdet = 0; + static Char_t trng = '\0'; + static UShort_t tsec = 0; + static Short_t tstr = 0; + static Short_t bstr = -1; + static UShort_t tsam = 0; + static UInt_t trate = 0; + static Int_t hwaddr = -1; + static UShort_t start = 0; + static UShort_t length = 0; + static Short_t t = -1; + static Int_t i = 0; + // First entry! + if (stream.GetDDLNumber() < 0) { + fReader->Select("FMD"); + + // Reset variables + ddl = -1; + trate = 0; + tdet = 0; + trng = '\0'; + tsec = 0; + tstr = 0; + tsam = -1; + hwaddr = -1; } - // if (!fReader->ReadHeader()) { - // AliError("Couldn't read header"); - // return kFALSE; - // } - // Get sample rate - AliFMDParameters* pars = AliFMDParameters::Instance(); - - // Select FMD DDL's - fReader->Select("FMD"); - - UShort_t stripMin = 0; - UShort_t stripMax = 127; - UShort_t preSamp = 0; - - do { - UChar_t* cdata; - if (!fReader->ReadNextData(cdata)) break; - size_t nchar = fReader->GetDataSize(); - UShort_t ddl = fReader->GetDDLID(); - UShort_t rate = 0; - AliFMDDebug(1, ("Reading %d bytes (%d 10bit words) from %d", - nchar, nchar * 8 / 10, ddl)); - // Make a stream to read from - std::string str((char*)(cdata), nchar); - std::istringstream s(str); - // Prep the reader class. - AliFMDAltroReader r(s); - // Data array is approx twice the size needed. - UShort_t data[2048], hwaddr, last; - while (r.ReadChannel(hwaddr, last, data) > 0) { - AliFMDDebug(5, ("Read channel 0x%x of size %d", hwaddr, last)); - UShort_t det, sec, str; - Char_t ring; - if (!pars->Hardware2Detector(ddl, hwaddr, det, ring, sec, str)) { - AliError(Form("Failed to detector id from DDL %d " - "and hardware address 0x%x", ddl, hwaddr)); - continue; - } - rate = pars->GetSampleRate(det, ring, sec, str); - stripMin = pars->GetMinStrip(det, ring, sec, str); - stripMax = pars->GetMaxStrip(det, ring, sec, str); - AliFMDDebug(5, ("DDL 0x%04x, address 0x%03x maps to FMD%d%c[%2d,%3d]", - ddl, hwaddr, det, ring, sec, str)); - - // Loop over the `timebins', and make the digits - for (size_t i = 0; i < last; i++) { - if (i < preSamp) continue; - Int_t n = array->GetEntries(); - UShort_t curStr = str + stripMin + i / rate; - if ((curStr-str) > stripMax) { - AliError(Form("Current strip is %d but DB says max is %d", - curStr, stripMax)); - } - AliFMDDebug(5, ("making digit for FMD%d%c[%2d,%3d] from sample %4d", - det, ring, sec, curStr, i)); - new ((*array)[n]) AliFMDDigit(det, ring, sec, curStr, data[i], - (rate >= 2 ? data[i+1] : 0), - (rate >= 3 ? data[i+2] : 0)); - if (rate >= 2) i++; - if (rate >= 3) i++; + + do { + if (t < start - length + 1) { + if (!stream.NextBunch()) { + if (!stream.NextChannel()) { + if (!stream.NextDDL()) { + stream.Reset(); + return kFALSE; + } + ddl = NewDDL(stream, tdet); } - if (r.IsBof()) break; + hwaddr = NewChannel(stream, tdet, trng, tsec, bstr); + } + start = stream.GetStartTimeBin(); + length = stream.GetBunchLength(); + t = start; + i = 0; + } + Int_t tadc = NewSample(stream, i, t, tsec, bstr, tstr, tsam); + if (tadc >= 0) { + det = tdet; + rng = trng; + sec = tsec; + str = tstr; + sam = tsam; + adc = tadc; + rat = fSampleRate[ddl]; + zs = fZeroSuppress[ddl]; + fac = fNoiseFactor[ddl]; + t--; + i++; + break; } } while (true); + return kTRUE; } - -// This is the old method, for comparison. It's really ugly, and far -// too convoluted. //____________________________________________________________________ -void -AliFMDRawReader::Exec(Option_t*) +Bool_t +AliFMDRawReader::NextSignal(UShort_t& det, Char_t& rng, + UShort_t& sec, UShort_t& str, + Short_t& adc, Bool_t& zs, + UShort_t& fac) { - // Read raw data into the digits array - // if (!fReader->ReadHeader()) { - // Error("ReadAdcs", "Couldn't read header"); - // return; - // } - - Int_t n = 0; - TClonesArray* array = new TClonesArray("AliFMDDigit"); - fTree->Branch("FMD", &array); + + do { + UShort_t samp, rate; + if (!NextSample(det, rng, sec, str, samp, rate, adc, zs, fac)) + return kFALSE; - // Get sample rate - AliFMDParameters* pars = AliFMDParameters::Instance(); - fSampleRate = pars->GetSampleRate(0); + Bool_t take = kFALSE; + switch (rate) { + case 1: take = kTRUE; break; + case 2: if (samp == 1) take = kTRUE; break; + case 3: if (samp == 1) take = kTRUE; break; + case 4: if (samp == 2) take = kTRUE; break; + default: if (samp == rate-2) take = kTRUE; break; + } + if (!take) continue; + break; + } while (true); + return kTRUE; +} - // Use AliAltroRawStream to read the ALTRO format. No need to - // reinvent the wheel :-) - AliFMDRawStream input(fReader, fSampleRate); - // Select FMD DDL's - fReader->Select("FMD"); +//____________________________________________________________________ +Bool_t +AliFMDRawReader::SelectSample(UShort_t samp, UShort_t rate) +{ + // Check if the passed sample is the one we need + Bool_t take = kFALSE; + switch (rate) { + case 1: take = kTRUE; break; + case 2: if (samp == 1) take = kTRUE; break; + case 3: if (samp == 1) take = kTRUE; break; + case 4: if (samp == 2) take = kTRUE; break; + default: if (samp == rate-2) take = kTRUE; break; + } - Int_t oldDDL = -1; - Int_t count = 0; - UShort_t detector = 1; // Must be one here - UShort_t oldDetector = 0; - Bool_t next = kTRUE; - - // local Cache - TArrayI counts(10); - counts.Reset(-1); + return take; +} - // Loop over data in file - while (next) { - next = input.Next(); - - count++; - Int_t ddl = fReader->GetDDLID(); - AliFMDDebug(10, ("Current DDL is %d", ddl)); - if (ddl != oldDDL || input.IsNewStrip() || !next) { - // Make a new digit, if we have some data (oldDetector == 0, - // means that we haven't really read anything yet - that is, - // it's the first time we get here). - if (oldDetector > 0) { - // Got a new strip. - AliFMDDebug(10, ("Add a new strip: FMD%d%c[%2d,%3d] " - "(current: FMD%d%c[%2d,%3d])", - oldDetector, input.PrevRing(), - input.PrevSector() , input.PrevStrip(), - detector , input.Ring(), input.Sector(), - input.Strip())); - new ((*array)[n]) AliFMDDigit(oldDetector, - input.PrevRing(), - input.PrevSector(), - input.PrevStrip(), - counts[0], counts[1], counts[2]); - n++; -#if 0 - AliFMDDigit* digit = - static_cast(fFMD->Digits()-> - UncheckedAt(fFMD->GetNdigits()-1)); -#endif - } - - if (!next) { - AliFMDDebug(10, ("Read %d channels for FMD%d", - count + 1, detector)); - break; - } - - - // If we got a new DDL, it means we have a new detector. - if (ddl != oldDDL) { - if (detector != 0) - AliFMDDebug(10, ("Read %d channels for FMD%d", count + 1, detector)); - // Reset counts, and update the DDL cache - count = 0; - oldDDL = ddl; - // Check that we're processing a FMD detector - Int_t detId = fReader->GetDetectorID(); - if (detId != (AliDAQ::DetectorID("FMD"))) { - AliError(Form("Detector ID %d != %d", - detId, (AliDAQ::DetectorID("FMD")))); - break; - } - // Figure out what detector we're deling with - oldDetector = detector; - switch (ddl) { - case 0: detector = 1; break; - case 1: detector = 2; break; - case 2: detector = 3; break; - default: - AliError(Form("Unknown DDL 0x%x for FMD", ddl)); - return; - } - AliFMDDebug(10, ("Reading ADCs for 0x%x - That is FMD%d", - fReader->GetEquipmentId(), detector)); - } - counts.Reset(-1); - } - - counts[input.Sample()] = input.Count(); - - AliFMDDebug(10, ("ADC of FMD%d%c[%2d,%3d] += %d", - detector, input.Ring(), input.Sector(), - input.Strip(), input.Count())); - oldDetector = detector; +//____________________________________________________________________ +Bool_t +AliFMDRawReader::ReadAdcs(TClonesArray* array) +{ + // Read ADC values from raw input into passed TClonesArray of AliFMDDigit + // objects. + AliFMDDebug(2, ("Reading ADC values into a TClonesArray")); + + // Read raw data into the digits array, using AliFMDAltroReader. + if (!array) { + AliError("No TClonesArray passed"); + return kFALSE; } - fTree->Fill(); - return; + const UShort_t kUShortMax = (1 << 16) - 1; + fSeen.Reset(kUShortMax); + + AliAltroRawStreamV3 input(fReader); + input.Reset(); + input.SelectRawData("FMD"); + + // Loop over input RORCs + while (input.NextDDL()) { + UShort_t det = 0; + Int_t ddl = NewDDL(input, det); + if (ddl < 0) break; + while (input.NextChannel()) { + // Get the hardware address, and map that to detector coordinates + Char_t ring; + UShort_t sec; + Short_t strbase; + Int_t hwaddr = NewChannel(input, det, ring, sec, strbase); + if (hwaddr < 0) break; + + // Loop over bunches + while (input.NextBunch()) { + // Get Lenght of bunch, and pointer to the data + const UShort_t* data = input.GetSignals(); + UShort_t start = input.GetStartTimeBin(); + UShort_t length = input.GetBunchLength(); + + // Loop over the data and store it. + for (Int_t i = 0; i < length; i++) { + // Time + Short_t str; + UShort_t samp; + Int_t t = start - i; + Int_t adc = NewSample(input, i, t, sec, strbase, str, samp); + if (adc < 0) continue; + UShort_t counts = adc; + + AliFMDDebug(10, ("FMD%d%c[%02d,%03d]-%d: %4d", + det, ring, sec, str, samp, counts)); + // Check the cache of indicies + Int_t idx = fSeen(det, ring, sec, str); + AliFMDDigit* digit = 0; + if (idx == kUShortMax) { + // We haven't seen this strip yet. + fSeen(det, ring, sec, str) = idx = array->GetEntriesFast(); + AliFMDDebug(7,("making digit for FMD%d%c[%2d,%3d]-%d " + "from timebin %4d", + det, ring, sec, str, samp, t)); + digit = new ((*array)[idx]) AliFMDDigit(det, ring, sec, str); + digit->SetDefaultCounts(fSampleRate[ddl]); + } + else + digit = static_cast(array->At(idx)); + AliFMDDebug(10, ("Setting FMD%d%c[%2d,%3d]-%d " + "from timebin %4d=%4d (%4d)", + det, ring, sec, str, samp, t, counts, data[i])); + digit->SetCount(samp, counts); + } // for (i) + } // while (bunch) + } // while (channel) + } // while (ddl) + return kTRUE; } -#endif + //____________________________________________________________________ Bool_t AliFMDRawReader::ReadSODevent(AliFMDCalibSampleRate* sampleRate, AliFMDCalibStripRange* stripRange, TArrayS &pulseSize, - TArrayS &pulseLength) { + TArrayS &pulseLength, + Bool_t* detectors) +{ AliFMDDebug(0, ("Start of SOD/EOD")); @@ -391,271 +553,267 @@ Bool_t AliFMDRawReader::ReadSODevent(AliFMDCalibSampleRate* sampleRate, UInt_t strip_high[18]; UInt_t pulse_size[18]; UInt_t pulse_length[18]; + AliFMDParameters* param = AliFMDParameters::Instance(); + AliFMDAltroMapping* map = param->GetAltroMap(); - while(fReader->ReadNextData(fData)) { - - Int_t ddl = fReader->GetDDLID(); + AliAltroRawStreamV3 streamer(fReader); + streamer.Reset(); + streamer.SelectRawData("FMD"); + //fReader->GetDDLID(); + while (streamer.NextDDL()) { + Int_t ddl = streamer.GetDDLNumber(); Int_t detID = fReader->GetDetectorID(); + if (detectors) detectors[map->DDL2Detector(ddl)-1] = kTRUE; AliFMDDebug(0, (" From reader: DDL number is %d , det ID is %d",ddl,detID)); + + ULong_t nPayloadWords = streamer.GetRCUPayloadSizeInSOD(); + UChar_t* payloadData = streamer.GetRCUPayloadInSOD(); + UInt_t* payloadWords = reinterpret_cast(payloadData); + //UInt_t* payloadWords = streamer.GetRCUPayloadInSOD(); + + //std::cout<GetDataSize(); - - ULong_t nWords = GetNwords(); - UInt_t trailerLast = Get32bitWord(nWords); - AliFMDDebug(20, (" # Bytes: %d, # Words: %d, Last word: 0x%08x", - fNbytes, nWords, trailerLast)); - if ((trailerLast & 0xFFFF0000) != 0xAAAA0000) { - AliWarning(Form("Last word 0x%08x does not match RCU II trailer", - trailerLast)); - return kFALSE; - } - - ULong_t nTrailerWords = trailerLast & 0x7f; // 7 last bits is size of trailer - - ULong_t nPayloadWords = Get32bitWord(nWords - nTrailerWords+1); - AliFMDDebug(20, (" # trailer words: %d, # payload words: %d", - nTrailerWords, nPayloadWords)); - - - for (ULong_t i = 1; i <= nPayloadWords ; i++) { - UInt_t payloadWord = Get32bitWord(i); - - // address is only 24 bit - UInt_t address = (0xffffff & payloadWord); - UInt_t type = ((address >> 21) & 0xf); - UInt_t error = ((address >> 20) & 0x1); - UInt_t bcast = ((address >> 18) & 0x1); - UInt_t bc_not_altro = ((address >> 17) & 0x1); - UInt_t board = ((address >> 12) & 0x1f); - UInt_t instruction = 0; - UInt_t chip = 0; - UInt_t channel = 0; - if(bc_not_altro) - instruction = address & 0xfff; - else { - chip = ((address >> 9) & 0x7); - channel = ((address >> 5) & 0x5); - instruction = (address & 0x1f); - } - - Bool_t readDataWord = kFALSE; - switch(type) { - case 0x0: // Fec read - readDataWord = kTRUE; - case 0x1: // Fec cmd - case 0x2: // Fec write - i++; - break; - case 0x4: // Loop - case 0x5: // Wait - break; - case 0x6: // End sequence - case 0x7: // End Mem - i = nPayloadWords + 1; - break; - default: - break; - } - + //std::cout<> 21) & 0xf); + UInt_t error = ((address >> 20) & 0x1); + UInt_t bcast = ((address >> 18) & 0x1); + UInt_t bc_not_altro = ((address >> 17) & 0x1); + UInt_t board = ((address >> 12) & 0x1f); + UInt_t instruction = 0; + UInt_t chip = 0; + UInt_t channel = 0; + if(bc_not_altro) + instruction = address & 0xfff; + else { + chip = ((address >> 9) & 0x7); + channel = ((address >> 5) & 0x5); + instruction = (address & 0x1f); + } + Bool_t readDataWord = kFALSE; + switch(type) { + case 0x0: // Fec read + readDataWord = kTRUE; + case 0x1: // Fec cmd + case 0x2: // Fec write + i++; + payloadWords++; + break; + case 0x4: // Loop + case 0x5: // Wait + break; + case 0x6: // End sequence + case 0x7: // End Mem + i = nPayloadWords + 1; + break; + default: + break; + } - if(!readDataWord) //Don't read unless we have a FEC_RD - continue; - UInt_t dataWord = Get32bitWord(i); - UInt_t data = (0xFFFFF & dataWord) ; - //UInt_t data = (0xFFFF & dataWord) ; + //Don't read unless we have a FEC_RD + if(!readDataWord) continue; + + UInt_t dataWord = *payloadWords;//Get32bitWord(i); + UInt_t data = (0xFFFFF & dataWord) ; + //UInt_t data = (0xFFFF & dataWord) ; - if(error) { - AliWarning(Form("error bit detected at Word 0x%06x; " - "error % d, type %d, bc_not_altro %d, " - "bcast %d, board 0x%02x, chip 0x%x, " - "channel 0x%02x, instruction 0x%03x", - address, error, type, bc_not_altro, - bcast,board,chip,channel,instruction)); - - - //process error - continue; - } + if(error) { + AliWarning(Form("error bit detected at Word 0x%06x; " + "error % d, type %d, bc_not_altro %d, " + "bcast %d, board 0x%02x, chip 0x%x, " + "channel 0x%02x, instruction 0x%03x", + address, error, type, bc_not_altro, + bcast,board,chip,channel,instruction)); + //process error + continue; + } - switch(instruction) { + switch(instruction) { - case 0x01: break; // First ADC T - case 0x02: break; // I 3.3 V - case 0x03: break; // I 2.5 V altro digital - case 0x04: break; // I 2.5 V altro analog - case 0x05: break; // I 2.5 V VA - case 0x06: break; // First ADC T - case 0x07: break; // I 3.3 V - case 0x08: break; // I 2.5 V altro digital - case 0x09: break; // I 2.5 V altro analog - case 0x0A: break; // I 2.5 V VA - case 0x2D: break; // Second ADC T - case 0x2E: break; // I 1.5 V VA - case 0x2F: break; // I -2.0 V - case 0x30: break; // I -2.0 V VA - case 0x31: break; // 2.5 V Digital driver - case 0x32: break; // Second ADC T - case 0x33: break; // I 1.5 V VA - case 0x34: break; // I -2.0 V - case 0x35: break; // I -2.0 V VA - case 0x36: break; // 2.5 V Digital driver - case 0x37: break; // Third ADC T - case 0x38: break; // Temperature sens. 1 - case 0x39: break; // Temperature sens. 2 - case 0x3A: break; // U 2.5 altro digital (m) - case 0x3B: break; // U 2.5 altro analog (m) - case 0x3C: break; // Third ADC T - case 0x3D: break; // Temperature sens. 1 - case 0x3E: break; // Temperature sens. 2 - case 0x3F: break; // U 2.5 altro digital (m) - case 0x40: break; // U 2.5 altro analog (m) - case 0x41: break; // Forth ADC T - case 0x42: break; // U 2.5 VA (m) - case 0x43: break; // U 1.5 VA (m) - case 0x44: break; // U -2.0 VA (m) - case 0x45: break; // U -2.0 (m) - case 0x46: break; // Forth ADC T - case 0x47: break; // U 2.5 VA (m) - case 0x48: break; // U 1.5 VA (m) - case 0x49: break; // U -2.0 VA (m) - case 0x4A: break; // U -2.0 (m) - // Counters - case 0x0B: break; // L1 trigger CouNTer - case 0x0C: break; // L2 trigger CouNTer - case 0x0D: break; // Sampling CLK CouNTer - case 0x0E: break; // DSTB CouNTer - // Test mode - case 0x0F: break; // Test mode word - case 0x10: break; // Undersampling ratio. - // Configuration and status - case 0x11: break; // Config/Status Register 0 - case 0x12: break; // Config/Status Register 1 - case 0x13: break; // Config/Status Register 2 - case 0x14: break; // Config/Status Register 3 - case 0x15: break; // Free - // Comands: - case 0x16: break; // Latch L1, L2, SCLK Counters - case 0x17: break; // Clear counters - case 0x18: break; // Clear CSR1 - case 0x19: break; // rstb ALTROs - case 0x1A: break; // rstb BC - case 0x1B: break; // Start conversion - case 0x1C: break; // Scan event length - case 0x1D: break; // Read event length - case 0x1E: break; // Start test mode - case 0x1F: break; // Read acquisition memory - // FMD - case 0x20: break; // FMDD status - case 0x21: break; // L0 counters - case 0x22: break; // FMD: Wait to hold - case 0x23: break; // FMD: L1 timeout - case 0x24: break; // FMD: L2 timeout - case 0x25: // FMD: Shift clk - shift_clk[board] = ((data >> 8 ) & 0xFF); - break; - case 0x26: // FMD: Strips - strip_low[board] = ((data >> 0 ) & 0xFF); - strip_high[board] = ((data >> 8 ) & 0xFF); - break; - case 0x27: // FMD: Cal pulse - pulse_size[board] = ((data >> 8 ) & 0xFF); - break; - case 0x28: break; // FMD: Shape bias - case 0x29: break; // FMD: Shape ref - case 0x2A: break; // FMD: Preamp ref - case 0x2B: // FMD: Sample clk - sample_clk[board] = ((data >> 8 ) & 0xFF); - break; - case 0x2C: break; // FMD: Commands - case 0x4B: // FMD: Cal events - pulse_length[board] = ((data >> 0 ) & 0xFF); - break; - default: break; + case 0x01: break; // First ADC T + case 0x02: break; // I 3.3 V + case 0x03: break; // I 2.5 V altro digital + case 0x04: break; // I 2.5 V altro analog + case 0x05: break; // I 2.5 V VA + case 0x06: break; // First ADC T + case 0x07: break; // I 3.3 V + case 0x08: break; // I 2.5 V altro digital + case 0x09: break; // I 2.5 V altro analog + case 0x0A: break; // I 2.5 V VA + case 0x2D: break; // Second ADC T + case 0x2E: break; // I 1.5 V VA + case 0x2F: break; // I -2.0 V + case 0x30: break; // I -2.0 V VA + case 0x31: break; // 2.5 V Digital driver + case 0x32: break; // Second ADC T + case 0x33: break; // I 1.5 V VA + case 0x34: break; // I -2.0 V + case 0x35: break; // I -2.0 V VA + case 0x36: break; // 2.5 V Digital driver + case 0x37: break; // Third ADC T + case 0x38: break; // Temperature sens. 1 + case 0x39: break; // Temperature sens. 2 + case 0x3A: break; // U 2.5 altro digital (m) + case 0x3B: break; // U 2.5 altro analog (m) + case 0x3C: break; // Third ADC T + case 0x3D: break; // Temperature sens. 1 + case 0x3E: break; // Temperature sens. 2 + case 0x3F: break; // U 2.5 altro digital (m) + case 0x40: break; // U 2.5 altro analog (m) + case 0x41: break; // Forth ADC T + case 0x42: break; // U 2.5 VA (m) + case 0x43: break; // U 1.5 VA (m) + case 0x44: break; // U -2.0 VA (m) + case 0x45: break; // U -2.0 (m) + case 0x46: break; // Forth ADC T + case 0x47: break; // U 2.5 VA (m) + case 0x48: break; // U 1.5 VA (m) + case 0x49: break; // U -2.0 VA (m) + case 0x4A: break; // U -2.0 (m) + // Counters + case 0x0B: break; // L1 trigger CouNTer + case 0x0C: break; // L2 trigger CouNTer + case 0x0D: break; // Sampling CLK CouNTer + case 0x0E: break; // DSTB CouNTer + // Test mode + case 0x0F: break; // Test mode word + case 0x10: break; // Undersampling ratio. + // Configuration and status + case 0x11: break; // Config/Status Register 0 + case 0x12: break; // Config/Status Register 1 + case 0x13: break; // Config/Status Register 2 + case 0x14: break; // Config/Status Register 3 + case 0x15: break; // Free + // Comands: + case 0x16: break; // Latch L1, L2, SCLK Counters + case 0x17: break; // Clear counters + case 0x18: break; // Clear CSR1 + case 0x19: break; // rstb ALTROs + case 0x1A: break; // rstb BC + case 0x1B: break; // Start conversion + case 0x1C: break; // Scan event length + case 0x1D: break; // Read event length + case 0x1E: break; // Start test mode + case 0x1F: break; // Read acquisition memory + // FMD + case 0x20: break; // FMDD status + case 0x21: break; // L0 counters + case 0x22: break; // FMD: Wait to hold + case 0x23: break; // FMD: L1 timeout + case 0x24: break; // FMD: L2 timeout + case 0x25: // FMD: Shift clk + shift_clk[board] = ((data >> 8 ) & 0xFF); + break; + case 0x26: // FMD: Strips + strip_low[board] = ((data >> 0 ) & 0xFF); + strip_high[board] = ((data >> 8 ) & 0xFF); + break; + case 0x27: // FMD: Cal pulse + pulse_size[board] = ((data >> 8 ) & 0xFF); + break; + case 0x28: break; // FMD: Shape bias + case 0x29: break; // FMD: Shape ref + case 0x2A: break; // FMD: Preamp ref + case 0x2B: // FMD: Sample clk + sample_clk[board] = ((data >> 8 ) & 0xFF); + break; + case 0x2C: break; // FMD: Commands + case 0x4B: // FMD: Cal events + pulse_length[board] = ((data >> 0 ) & 0xFF); + break; + default: break; - } - AliFMDDebug(50, ("instruction 0x%x, dataword 0x%x",instruction,dataWord)); - } + } + AliFMDDebug(50, ("instruction 0x%x, dataword 0x%x", + instruction,dataWord)); + } // End of loop over Result memory event - UShort_t det,sector,strip; + UShort_t det,sector; + Short_t strip; Char_t ring; const UInt_t boards[4] = {0,1,16,17}; for(Int_t i=0;i<4;i++) { - if(ddl==0 && (i==1 || i==3)) - continue; + if(ddl==0 && (i==1 || i==3)) continue; + UInt_t chip =0, channel=0; - - AliFMDParameters::Instance()->Hardware2Detector(ddl,boards[i],chip,channel,det,ring,sector,strip); + det = map->DDL2Detector(ddl); + map->Channel2StripBase(boards[i], chip, channel, ring, sector, strip); UInt_t samplerate = 1; - if(sample_clk[boards[i]] == 0) { - if(ddl == 0) { - Int_t sample1 = sample_clk[boards[0]]; - Int_t sample2 = sample_clk[boards[2]]; - if(sample1) sample_clk[boards[i]] = sample1; - else sample_clk[boards[i]] = sample2; - } - - if(ddl!=0) { - Int_t sample1 = sample_clk[boards[0]]; - Int_t sample2 = sample_clk[boards[1]]; - Int_t sample3 = sample_clk[boards[2]]; - Int_t sample4 = sample_clk[boards[3]]; - Int_t agreement = 0; - if(sample1 == sample2) agreement++; - if(sample1 == sample3) agreement++; - if(sample1 == sample4) agreement++; - if(sample2 == sample3) agreement++; - if(sample2 == sample4) agreement++; - if(sample3 == sample4) agreement++; + if(ddl == 0) { + Int_t sample1 = sample_clk[boards[0]]; + Int_t sample2 = sample_clk[boards[2]]; + if(sample1) sample_clk[boards[i]] = sample1; + else sample_clk[boards[i]] = sample2; + } + else { + Int_t sample1 = sample_clk[boards[0]]; + Int_t sample2 = sample_clk[boards[1]]; + Int_t sample3 = sample_clk[boards[2]]; + Int_t sample4 = sample_clk[boards[3]]; + Int_t agreement = 0; + if(sample1 == sample2) agreement++; + if(sample1 == sample3) agreement++; + if(sample1 == sample4) agreement++; + if(sample2 == sample3) agreement++; + if(sample2 == sample4) agreement++; + if(sample3 == sample4) agreement++; - Int_t idx = 0; - if(i<3) idx = i+1; - else idx = i-1; - if(agreement == 3) { - sample_clk[boards[i]] = sample_clk[boards[idx]]; - shift_clk[boards[i]] = shift_clk[boards[idx]]; - strip_low[boards[i]] = strip_low[boards[idx]]; - strip_high[boards[i]] = strip_high[boards[idx]]; - pulse_length[boards[i]] = pulse_length[boards[idx]]; - pulse_size[boards[i]] = pulse_size[boards[idx]]; - AliFMDDebug(0, ("Vote taken for ddl %d, board 0x%x",ddl,boards[i])); - } + Int_t idx = 0; + if(i<3) idx = i+1; + else idx = i-1; + if(agreement == 3) { + sample_clk[boards[i]] = sample_clk[boards[idx]]; + shift_clk[boards[i]] = shift_clk[boards[idx]]; + strip_low[boards[i]] = strip_low[boards[idx]]; + strip_high[boards[i]] = strip_high[boards[idx]]; + pulse_length[boards[i]] = pulse_length[boards[idx]]; + pulse_size[boards[i]] = pulse_size[boards[idx]]; + AliFMDDebug(0, ("Vote taken for ddl %d, board 0x%x", + ddl,boards[i])); } + } } if(sample_clk[boards[i]]) - samplerate = shift_clk[boards[i]]/sample_clk[boards[i]]; + samplerate = shift_clk[boards[i]]/sample_clk[boards[i]]; sampleRate->Set(det,ring,sector,0,samplerate); - stripRange->Set(det,ring,sector,0,strip_low[boards[i]],strip_high[boards[i]]); + stripRange->Set(det,ring,sector,0, + strip_low[boards[i]],strip_high[boards[i]]); AliFMDDebug(20, ("det %d, ring %c, ",det,ring)); - pulseLength.AddAt(pulse_length[boards[i]],GetHalfringIndex(det,ring,boards[i]/16)); - pulseSize.AddAt(pulse_size[boards[i]],GetHalfringIndex(det,ring,boards[i]/16)); + pulseLength.AddAt(pulse_length[boards[i]], + GetHalfringIndex(det,ring,boards[i]/16)); + pulseSize.AddAt(pulse_size[boards[i]], + GetHalfringIndex(det,ring,boards[i]/16)); AliFMDDebug(20, (": Board: 0x%02x\n" - "\tstrip_low %3d, strip_high %3d\n" - "\tshift_clk %3d, sample_clk %3d\n" - "\tpulse_size %3d, pulse_length %3d", - boards[i], - strip_low[boards[i]], strip_high[boards[i]], - shift_clk[boards[i]], sample_clk[boards[i]], - pulse_size[boards[i]],pulse_length[boards[i]])); - } + "\tstrip_low %3d, strip_high %3d\n" + "\tshift_clk %3d, sample_clk %3d\n" + "\tpulse_size %3d, pulse_length %3d", + boards[i], + strip_low[boards[i]], strip_high[boards[i]], + shift_clk[boards[i]], sample_clk[boards[i]], + pulse_size[boards[i]],pulse_length[boards[i]])); + } - } + } AliFMDParameters::Instance()->SetSampleRate(sampleRate); AliFMDParameters::Instance()->SetStripRange(stripRange); AliFMDDebug(0, ("End of SOD/EOD")); - + return kTRUE; } //____________________________________________________________________ @@ -688,7 +846,8 @@ UInt_t AliFMDRawReader::Get32bitWord(Int_t idx) return word; } //_____________________________________________________________________ -Int_t AliFMDRawReader::GetHalfringIndex(UShort_t det, Char_t ring, UShort_t board) { +Int_t AliFMDRawReader::GetHalfringIndex(UShort_t det, Char_t ring, + UShort_t board) { UShort_t iring = (ring == 'I' ? 1 : 0); @@ -697,7 +856,9 @@ Int_t AliFMDRawReader::GetHalfringIndex(UShort_t det, Char_t ring, UShort_t boar return index-2; } + //____________________________________________________________________ // // EOF // +