[u/mrichter/AliRoot.git] / FMD / AliFMDRawReader.cxx

/**************************************************************************
 * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
 *                                                                        *
 * Author: The ALICE Off-line Project.                                    *
 * Contributors are mentioned in the code where appropriate.              *
 *                                                                        *
 * Permission to use, copy, modify and distribute this software and its   *
 * documentation strictly for non-commercial purposes is hereby granted   *
 * without fee, provided that the above copyright notice appears in all   *
 * copies and that both the copyright notice and this permission notice   *
 * appear in the supporting documentation. The authors make no claims     *
 * about the suitability of this software for any purpose. It is          *
 * provided "as is" without express or implied warranty.                  *
 **************************************************************************/
/* $Id$ */
/** @file    AliFMDRawReader.cxx
    @author  Christian Holm Christensen <cholm@nbi.dk>
    @date    Mon Mar 27 12:45:23 2006
    @brief   Class to read raw data 
    @ingroup FMD_rec
*/
//____________________________________________________________________
//
// Class to read ADC values from a AliRawReader object. 
//
// This class uses the AliFMDRawStreamer class to read the ALTRO
// formatted data. 
// 
//          +-------+
//          | TTask |
//          +-------+
//              ^
//              |
//      +-----------------+  <<references>>  +--------------+
//      | AliFMDRawReader |<>----------------| AliRawReader |
//      +-----------------+                  +--------------+
//              |                                  ^
//              | <<uses>>                         |
//              V                                  |
//      +-----------------+      <<uses>>          |
//      | AliFMDRawStream |------------------------+
//      +-----------------+
//              |
//              V
//      +----------------+
//      | AliAltroStream |
//      +----------------+
//
// #include <AliLog.h>		// ALILOG_H
#include "AliFMDDebug.h" // Better debug macros
#include "AliFMDParameters.h"	// ALIFMDPARAMETERS_H
#include "AliFMDDigit.h"	// ALIFMDDIGIT_H
#include "AliFMDRawStream.h"	// ALIFMDRAWSTREAM_H 
// #include "AliRawReader.h"	// ALIRAWREADER_H 
#include "AliFMDRawReader.h"	// ALIFMDRAWREADER_H 
// #include "AliFMDAltroIO.h"	// ALIFMDALTROIO_H 
// #include <TArrayI.h>		// ROOT_TArrayI
#include <TTree.h>		// ROOT_TTree
#include <TClonesArray.h>	// ROOT_TClonesArray
// #include <iostream>
// #include <iomanip>

//____________________________________________________________________
ClassImp(AliFMDRawReader)
#if 0
  ; // This is here to keep Emacs for indenting the next line
#endif

//____________________________________________________________________
AliFMDRawReader::AliFMDRawReader(AliRawReader* reader, TTree* tree) 
  : TTask("FMDRawReader", "Reader of Raw ADC values from the FMD"),
    fTree(tree),
    fReader(reader), 
    fSampleRate(1)
{
  // Default CTOR
}

//____________________________________________________________________
void
AliFMDRawReader::Exec(Option_t*) 
{
  // Read the data 
  TClonesArray* array = new TClonesArray("AliFMDDigit");
  if (!fTree) {
    AliError("No tree");
    return;
  }
  fTree->Branch("FMD", &array);
  ReadAdcs(array);
  Int_t nWrite = fTree->Fill();
  AliFMDDebug(1, ("Got a grand total of %d digits, wrote %d bytes to tree", 
		   array->GetEntries(), nWrite));
}


#if 1
//____________________________________________________________________
Bool_t
AliFMDRawReader::ReadAdcs(TClonesArray* array) 
{
  // Read raw data into the digits array, using AliFMDAltroReader. 
  if (!array) {
    AliError("No TClonesArray passed");
    return kFALSE;
  }
  //  if (!fReader->ReadHeader()) {
  //    AliError("Couldn't read header");
  //    return kFALSE;
  //  }
  // Get sample rate 
  AliFMDParameters* pars = AliFMDParameters::Instance();
  AliFMDRawStream input(fReader);
  AliFMDDebug(5, ("Setting old RCU format and 7 word headers"));
  input.SetOldRCUFormat(!pars->HasRcuTrailer());
  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++;
    }
  }
  return kTRUE;
}
#else
//____________________________________________________________________
Bool_t
AliFMDRawReader::ReadAdcs(TClonesArray* array) 
{
  // Read raw data into the digits array, using AliFMDAltroReader. 
  if (!array) {
    AliError("No TClonesArray passed");
    return kFALSE;
  }
  //  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++;
	}
	if (r.IsBof()) 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*) 
{
  // 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);

  // Get sample rate 
  AliFMDParameters* pars = AliFMDParameters::Instance();
  fSampleRate = pars->GetSampleRate(0);

  // Use AliAltroRawStream to read the ALTRO format.  No need to
  // reinvent the wheel :-) 
  AliFMDRawStream input(fReader, fSampleRate);
  // Select FMD DDL's 
  fReader->Select("FMD");
  
  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);
  
  // 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<AliFMDDigit*>(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;
  }
  fTree->Fill();
  return;

}
#endif

//____________________________________________________________________
// 
// EOF
//
Commit	Line	Data
e802be3e	1	/**************************************************************************
	2	* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
	3	* *
	4	* Author: The ALICE Off-line Project. *
	5	* Contributors are mentioned in the code where appropriate. *
	6	* *
	7	* Permission to use, copy, modify and distribute this software and its *
	8	* documentation strictly for non-commercial purposes is hereby granted *
	9	* without fee, provided that the above copyright notice appears in all *
	10	* copies and that both the copyright notice and this permission notice *
	11	* appear in the supporting documentation. The authors make no claims *
	12	* about the suitability of this software for any purpose. It is *
	13	* provided "as is" without express or implied warranty. *
	14	**************************************************************************/
e802be3e	15	/* $Id$ */
c2fc1258	16	/** @file AliFMDRawReader.cxx
	17	@author Christian Holm Christensen <cholm@nbi.dk>
	18	@date Mon Mar 27 12:45:23 2006
	19	@brief Class to read raw data
02a27b50	20	@ingroup FMD_rec
c2fc1258	21	*/
e802be3e	22	//____________________________________________________________________
	23	//
	24	// Class to read ADC values from a AliRawReader object.
	25	//
7684b53c	26	// This class uses the AliFMDRawStreamer class to read the ALTRO
	27	// formatted data.
	28	//
	29	// +-------+
	30	// \| TTask \|
	31	// +-------+
	32	// ^
	33	// \|
	34	// +-----------------+ <<references>> +--------------+
	35	// \| AliFMDRawReader \|<>----------------\| AliRawReader \|
	36	// +-----------------+ +--------------+
	37	// \| ^
	38	// \| <<uses>> \|
	39	// V \|
	40	// +-----------------+ <<uses>> \|
	41	// \| AliFMDRawStream \|------------------------+
	42	// +-----------------+
	43	// \|
	44	// V
	45	// +----------------+
	46	// \| AliAltroStream \|
	47	// +----------------+
	48	//
f95a63c4	49	// #include <AliLog.h> // ALILOG_H
f95a63c4	50	#include "AliFMDDebug.h" // Better debug macros
1a1fdef7	51	#include "AliFMDParameters.h" // ALIFMDPARAMETERS_H
e802be3e	52	#include "AliFMDDigit.h" // ALIFMDDIGIT_H
e802be3e	53	#include "AliFMDRawStream.h" // ALIFMDRAWSTREAM_H
6169f936	54	// #include "AliRawReader.h" // ALIRAWREADER_H
e802be3e	55	#include "AliFMDRawReader.h" // ALIFMDRAWREADER_H
c2fc1258	56	// #include "AliFMDAltroIO.h" // ALIFMDALTROIO_H
02a27b50	57	// #include <TArrayI.h> // ROOT_TArrayI
1a1fdef7	58	#include <TTree.h> // ROOT_TTree
1a1fdef7	59	#include <TClonesArray.h> // ROOT_TClonesArray
02a27b50	60	// #include <iostream>
02a27b50	61	// #include <iomanip>
e802be3e	62
e802be3e	63	//____________________________________________________________________
925e6570	64	ClassImp(AliFMDRawReader)
1a1fdef7	65	#if 0
	66	; // This is here to keep Emacs for indenting the next line
	67	#endif
e802be3e	68
e802be3e	69	//____________________________________________________________________
1a1fdef7	70	AliFMDRawReader::AliFMDRawReader(AliRawReader* reader, TTree* tree)
e802be3e	71	: TTask("FMDRawReader", "Reader of Raw ADC values from the FMD"),
1a1fdef7	72	fTree(tree),
	73	fReader(reader),
	74	fSampleRate(1)
e802be3e	75	{
56b1929b	76	// Default CTOR
e802be3e	77	}
e802be3e	78
c2fc1258	79	//____________________________________________________________________
	80	void
	81	AliFMDRawReader::Exec(Option_t*)
	82	{
02a27b50	83	// Read the data
c2fc1258	84	TClonesArray* array = new TClonesArray("AliFMDDigit");
	85	if (!fTree) {
	86	AliError("No tree");
	87	return;
	88	}
	89	fTree->Branch("FMD", &array);
	90	ReadAdcs(array);
	91	Int_t nWrite = fTree->Fill();
f95a63c4	92	AliFMDDebug(1, ("Got a grand total of %d digits, wrote %d bytes to tree",
c2fc1258	93	array->GetEntries(), nWrite));
	94	}
	95
	96
	97	#if 1
	98	//____________________________________________________________________
	99	Bool_t
	100	AliFMDRawReader::ReadAdcs(TClonesArray* array)
	101	{
	102	// Read raw data into the digits array, using AliFMDAltroReader.
	103	if (!array) {
	104	AliError("No TClonesArray passed");
	105	return kFALSE;
	106	}
d56f2b53	107	// if (!fReader->ReadHeader()) {
	108	// AliError("Couldn't read header");
	109	// return kFALSE;
	110	// }
c2fc1258	111	// Get sample rate
	112	AliFMDParameters* pars = AliFMDParameters::Instance();
	113	AliFMDRawStream input(fReader);
625d7886	114	AliFMDDebug(5, ("Setting old RCU format and 7 word headers"));
	115	input.SetOldRCUFormat(!pars->HasRcuTrailer());
	116	input.SetShortDataHeader(!pars->HasCompleteHeader());
c2fc1258	117
	118	UShort_t stripMin = 0;
	119	UShort_t stripMax = 127;
625d7886	120	UShort_t preSamp = 14+5;
c2fc1258	121
	122	UInt_t ddl = 0;
	123	UInt_t rate = 0;
	124	UInt_t last = 0;
	125	UInt_t hwaddr = 0;
	126	// Data array is approx twice the size needed.
	127	UShort_t data[2048];
2b893216	128
625d7886	129	Bool_t isGood = kTRUE;
	130	while (isGood) {
	131	isGood = input.ReadChannel(ddl, hwaddr, last, data);
7b4569a9	132	if (!isGood) break;
2b893216	133
f95a63c4	134	AliFMDDebug(5, ("Read channel 0x%x of size %d", hwaddr, last));
c2fc1258	135	UShort_t det, sec, str;
	136	Char_t ring;
	137	if (!pars->Hardware2Detector(ddl, hwaddr, det, ring, sec, str)) {
	138	AliError(Form("Failed to get detector id from DDL %d "
	139	"and hardware address 0x%x", ddl, hwaddr));
	140	continue;
	141	}
	142	rate = pars->GetSampleRate(det, ring, sec, str);
	143	stripMin = pars->GetMinStrip(det, ring, sec, str);
	144	stripMax = pars->GetMaxStrip(det, ring, sec, str);
625d7886	145	preSamp = pars->GetPreSamples(det, ring, sec, str);
f95a63c4	146	AliFMDDebug(5, ("DDL 0x%04x, address 0x%03x maps to FMD%d%c[%2d,%3d]",
c2fc1258	147	ddl, hwaddr, det, ring, sec, str));
	148
	149	// Loop over the `timebins', and make the digits
	150	for (size_t i = 0; i < last; i++) {
	151	if (i < preSamp) continue;
b29d3b0b	152	Int_t n = array->GetEntriesFast();
625d7886	153	Short_t curStr = str + stripMin + (i-preSamp) / rate;
c2fc1258	154	if ((curStr-str) > stripMax) {
625d7886	155	// AliInfo(Form("timebin %4d -> (%3d+%3d+(%4d-%d)/%d) -> %d",
	156	// i, str, stripMin, i, preSamp, rate, curStr));
	157	// AliError(Form("Current strip is %3d (0x%04x,0x%03x,%4d) "
	158	// "but DB says max is %3d (rate=%d)",
	159	// curStr, ddl, hwaddr, i, str+stripMax, rate));
	160	// Garbage timebins - ignore
	161	continue;
c2fc1258	162	}
f95a63c4	163	AliFMDDebug(5, ("making digit for FMD%d%c[%2d,%3d] from sample %4d",
c2fc1258	164	det, ring, sec, curStr, i));
	165	new ((*array)[n]) AliFMDDigit(det, ring, sec, curStr, data[i],
	166	(rate >= 2 ? data[i+1] : 0),
2aeec17d	167	(rate >= 3 ? data[i+2] : 0),
2aeec17d	168	(rate >= 4 ? data[i+3] : 0));
c2fc1258	169	if (rate >= 2) i++;
c2fc1258	170	if (rate >= 3) i++;
2aeec17d	171	if (rate >= 4) i++;
c2fc1258	172	}
	173	}
	174	return kTRUE;
	175	}
	176	#else
1e8f773e	177	//____________________________________________________________________
d760ea03	178	Bool_t
d760ea03	179	AliFMDRawReader::ReadAdcs(TClonesArray* array)
1e8f773e	180	{
1e8f773e	181	// Read raw data into the digits array, using AliFMDAltroReader.
d760ea03	182	if (!array) {
	183	AliError("No TClonesArray passed");
	184	return kFALSE;
	185	}
d56f2b53	186	// if (!fReader->ReadHeader()) {
	187	// AliError("Couldn't read header");
	188	// return kFALSE;
	189	// }
1e8f773e	190	// Get sample rate
	191	AliFMDParameters* pars = AliFMDParameters::Instance();
	192
	193	// Select FMD DDL's
362c9d61	194	fReader->Select("FMD");
1e8f773e	195
	196	UShort_t stripMin = 0;
	197	UShort_t stripMax = 127;
	198	UShort_t preSamp = 0;
	199
	200	do {
	201	UChar_t* cdata;
	202	if (!fReader->ReadNextData(cdata)) break;
	203	size_t nchar = fReader->GetDataSize();
362c9d61	204	UShort_t ddl = fReader->GetDDLID();
c2fc1258	205	UShort_t rate = 0;
f95a63c4	206	AliFMDDebug(1, ("Reading %d bytes (%d 10bit words) from %d",
1e8f773e	207	nchar, nchar * 8 / 10, ddl));
	208	// Make a stream to read from
	209	std::string str((char*)(cdata), nchar);
	210	std::istringstream s(str);
	211	// Prep the reader class.
	212	AliFMDAltroReader r(s);
	213	// Data array is approx twice the size needed.
	214	UShort_t data[2048], hwaddr, last;
	215	while (r.ReadChannel(hwaddr, last, data) > 0) {
f95a63c4	216	AliFMDDebug(5, ("Read channel 0x%x of size %d", hwaddr, last));
1e8f773e	217	UShort_t det, sec, str;
	218	Char_t ring;
	219	if (!pars->Hardware2Detector(ddl, hwaddr, det, ring, sec, str)) {
	220	AliError(Form("Failed to detector id from DDL %d "
	221	"and hardware address 0x%x", ddl, hwaddr));
	222	continue;
	223	}
c2fc1258	224	rate = pars->GetSampleRate(det, ring, sec, str);
	225	stripMin = pars->GetMinStrip(det, ring, sec, str);
	226	stripMax = pars->GetMaxStrip(det, ring, sec, str);
f95a63c4	227	AliFMDDebug(5, ("DDL 0x%04x, address 0x%03x maps to FMD%d%c[%2d,%3d]",
1e8f773e	228	ddl, hwaddr, det, ring, sec, str));
	229
	230	// Loop over the `timebins', and make the digits
	231	for (size_t i = 0; i < last; i++) {
	232	if (i < preSamp) continue;
d760ea03	233	Int_t n = array->GetEntries();
1e8f773e	234	UShort_t curStr = str + stripMin + i / rate;
	235	if ((curStr-str) > stripMax) {
	236	AliError(Form("Current strip is %d but DB says max is %d",
	237	curStr, stripMax));
	238	}
f95a63c4	239	AliFMDDebug(5, ("making digit for FMD%d%c[%2d,%3d] from sample %4d",
1e8f773e	240	det, ring, sec, curStr, i));
	241	new ((*array)[n]) AliFMDDigit(det, ring, sec, curStr, data[i],
	242	(rate >= 2 ? data[i+1] : 0),
	243	(rate >= 3 ? data[i+2] : 0));
	244	if (rate >= 2) i++;
	245	if (rate >= 3) i++;
	246	}
	247	if (r.IsBof()) break;
	248	}
	249	} while (true);
d760ea03	250	return kTRUE;
	251	}
	252
	253
	254
1e8f773e	255	// This is the old method, for comparison. It's really ugly, and far
1e8f773e	256	// too convoluted.
e802be3e	257	//____________________________________________________________________
	258	void
	259	AliFMDRawReader::Exec(Option_t*)
	260	{
56b1929b	261	// Read raw data into the digits array
d56f2b53	262	// if (!fReader->ReadHeader()) {
	263	// Error("ReadAdcs", "Couldn't read header");
	264	// return;
	265	// }
e802be3e	266
1a1fdef7	267	Int_t n = 0;
	268	TClonesArray* array = new TClonesArray("AliFMDDigit");
	269	fTree->Branch("FMD", &array);
	270
8f6ee336	271	// Get sample rate
8f6ee336	272	AliFMDParameters* pars = AliFMDParameters::Instance();
362c9d61	273	fSampleRate = pars->GetSampleRate(0);
8f6ee336	274
e802be3e	275	// Use AliAltroRawStream to read the ALTRO format. No need to
	276	// reinvent the wheel :-)
	277	AliFMDRawStream input(fReader, fSampleRate);
	278	// Select FMD DDL's
362c9d61	279	fReader->Select("FMD");
e802be3e	280
	281	Int_t oldDDL = -1;
	282	Int_t count = 0;
	283	UShort_t detector = 1; // Must be one here
	284	UShort_t oldDetector = 0;
	285	Bool_t next = kTRUE;
	286
	287	// local Cache
	288	TArrayI counts(10);
	289	counts.Reset(-1);
	290
	291	// Loop over data in file
	292	while (next) {
	293	next = input.Next();
	294
	295	count++;
	296	Int_t ddl = fReader->GetDDLID();
f95a63c4	297	AliFMDDebug(10, ("Current DDL is %d", ddl));
e802be3e	298	if (ddl != oldDDL \|\| input.IsNewStrip() \|\| !next) {
	299	// Make a new digit, if we have some data (oldDetector == 0,
	300	// means that we haven't really read anything yet - that is,
	301	// it's the first time we get here).
	302	if (oldDetector > 0) {
	303	// Got a new strip.
f95a63c4	304	AliFMDDebug(10, ("Add a new strip: FMD%d%c[%2d,%3d] "
e802be3e	305	"(current: FMD%d%c[%2d,%3d])",
	306	oldDetector, input.PrevRing(),
	307	input.PrevSector() , input.PrevStrip(),
	308	detector , input.Ring(), input.Sector(),
	309	input.Strip()));
1a1fdef7	310	new ((*array)[n]) AliFMDDigit(oldDetector,
	311	input.PrevRing(),
	312	input.PrevSector(),
	313	input.PrevStrip(),
	314	counts[0], counts[1], counts[2]);
	315	n++;
e802be3e	316	#if 0
	317	AliFMDDigit* digit =
	318	static_cast<AliFMDDigit*>(fFMD->Digits()->
	319	UncheckedAt(fFMD->GetNdigits()-1));
	320	#endif
	321	}
	322
	323	if (!next) {
f95a63c4	324	AliFMDDebug(10, ("Read %d channels for FMD%d",
e802be3e	325	count + 1, detector));
	326	break;
	327	}
	328
	329
	330	// If we got a new DDL, it means we have a new detector.
	331	if (ddl != oldDDL) {
	332	if (detector != 0)
f95a63c4	333	AliFMDDebug(10, ("Read %d channels for FMD%d", count + 1, detector));
e802be3e	334	// Reset counts, and update the DDL cache
	335	count = 0;
	336	oldDDL = ddl;
	337	// Check that we're processing a FMD detector
	338	Int_t detId = fReader->GetDetectorID();
362c9d61	339	if (detId != (AliDAQ::DetectorID("FMD"))) {
1e8f773e	340	AliError(Form("Detector ID %d != %d",
362c9d61	341	detId, (AliDAQ::DetectorID("FMD"))));
e802be3e	342	break;
	343	}
	344	// Figure out what detector we're deling with
	345	oldDetector = detector;
	346	switch (ddl) {
	347	case 0: detector = 1; break;
	348	case 1: detector = 2; break;
	349	case 2: detector = 3; break;
	350	default:
1e8f773e	351	AliError(Form("Unknown DDL 0x%x for FMD", ddl));
e802be3e	352	return;
e802be3e	353	}
f95a63c4	354	AliFMDDebug(10, ("Reading ADCs for 0x%x - That is FMD%d",
e802be3e	355	fReader->GetEquipmentId(), detector));
	356	}
	357	counts.Reset(-1);
	358	}
	359
	360	counts[input.Sample()] = input.Count();
	361
f95a63c4	362	AliFMDDebug(10, ("ADC of FMD%d%c[%2d,%3d] += %d",
e802be3e	363	detector, input.Ring(), input.Sector(),
	364	input.Strip(), input.Count()));
	365	oldDetector = detector;
	366	}
1a1fdef7	367	fTree->Fill();
e802be3e	368	return;
	369
	370	}
1e8f773e	371	#endif
e802be3e	372
	373	//____________________________________________________________________
	374	//
	375	// EOF
	376	//