AliITSRawStream classes removed (will be moved to ITS)
authortkuhr <tkuhr@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 14 Dec 2004 12:48:23 +0000 (12:48 +0000)
committertkuhr <tkuhr@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 14 Dec 2004 12:48:23 +0000 (12:48 +0000)
12 files changed:
RAW/AliITSRawStream.cxx [deleted file]
RAW/AliITSRawStream.h [deleted file]
RAW/AliITSRawStreamSDD.cxx [deleted file]
RAW/AliITSRawStreamSDD.h [deleted file]
RAW/AliITSRawStreamSDDv2.cxx [deleted file]
RAW/AliITSRawStreamSDDv2.h [deleted file]
RAW/AliITSRawStreamSPD.cxx [deleted file]
RAW/AliITSRawStreamSPD.h [deleted file]
RAW/AliITSRawStreamSSD.cxx [deleted file]
RAW/AliITSRawStreamSSD.h [deleted file]
RAW/RAWLinkDef.h
RAW/libRAW.pkg

diff --git a/RAW/AliITSRawStream.cxx b/RAW/AliITSRawStream.cxx
deleted file mode 100644 (file)
index eb1b437..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/**************************************************************************
- * 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$ */
-
-///////////////////////////////////////////////////////////////////////////////
-///
-/// This is a base class for providing access to ITS digits in raw data.
-///
-/// Derived class should implement the Next method.
-///
-/// It loops over all ITS digits in the raw data given by the AliRawReader.
-/// The Next method goes to the next digit. If there are no digits left
-/// it returns kFALSE.
-/// Several getters provide information about the current digit.
-///
-///////////////////////////////////////////////////////////////////////////////
-
-#include "AliITSRawStream.h"
-
-ClassImp(AliITSRawStream)
-
-
-AliITSRawStream::AliITSRawStream(AliRawReader* rawReader)
-{
-// create an object to read ITS raw digits
-
-  fRawReader = rawReader;
-  fModuleID = fPrevModuleID = fCoord1 = fCoord2 = fSignal = -1;
-}
-
-AliITSRawStream::AliITSRawStream(const AliITSRawStream& stream) :
-  TObject(stream)
-{
-  Fatal("AliITSRawStream", "copy constructor not implemented");
-}
-
-AliITSRawStream& AliITSRawStream::operator = (const AliITSRawStream& 
-                                             /* stream */)
-{
-  Fatal("operator =", "assignment operator not implemented");
-  return *this;
-}
-
diff --git a/RAW/AliITSRawStream.h b/RAW/AliITSRawStream.h
deleted file mode 100644 (file)
index 1c7fd53..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef ALIITSRAWSTREAM_H
-#define ALIITSRAWSTREAM_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-
-///////////////////////////////////////////////////////////////////////////////
-///
-/// This is a base class for providing access to ITS digits in raw data.
-///
-///////////////////////////////////////////////////////////////////////////////
-
-#include <TObject.h>
-
-class AliRawReader;
-
-
-class AliITSRawStream: public TObject {
-  public :
-    AliITSRawStream(AliRawReader* rawReader);
-    AliITSRawStream(const AliITSRawStream& stream);
-    AliITSRawStream& operator = (const AliITSRawStream& stream);
-    virtual ~AliITSRawStream() {};
-
-    virtual Bool_t   Next() = 0;
-
-    Int_t            GetModuleID() const {return fModuleID;};
-    Int_t            GetPrevModuleID() const {return fPrevModuleID;};
-    Bool_t           IsNewModule() const {return fModuleID != fPrevModuleID;};
-    Int_t            GetCoord1() const {return fCoord1;};
-    Int_t            GetCoord2() const {return fCoord2;};
-    Int_t            GetSignal() const {return fSignal;};
-
-  protected :
-    AliRawReader*    fRawReader;    // object for reading the raw data
-
-    Int_t            fModuleID;     // index of current module
-    Int_t            fPrevModuleID; // index of previous module
-    Int_t            fCoord1;       // current 1st coordinate
-                                    //  SPD: column cell number (z)
-                                    //  SDD: anode cell number (z)
-                                    //  SSD: N/P, flag for side
-    Int_t            fCoord2;       // current 2nd coordinate
-                                    //  SPD: row cell number (y)
-                                    //  SDD: time bin number (y)
-                                    //  SSD: strip number
-    Int_t            fSignal;       // signal in ADC counts
-
-    ClassDef(AliITSRawStream, 0) // base class for reading ITS raw digits
-};
-
-#endif
diff --git a/RAW/AliITSRawStreamSDD.cxx b/RAW/AliITSRawStreamSDD.cxx
deleted file mode 100644 (file)
index 7aa5a56..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/**************************************************************************
- * 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$ */
-
-///////////////////////////////////////////////////////////////////////////////
-///
-/// This class provides access to ITS SDD digits in raw data.
-///
-///////////////////////////////////////////////////////////////////////////////
-
-#include "AliITSRawStreamSDD.h"
-#include "AliRawReader.h"
-
-ClassImp(AliITSRawStreamSDD)
-
-
-const Int_t AliITSRawStreamSDD::fgkDDLModuleMap[kDDLsNumber][kModulesPerDDL] = {
-  {240,241,242,246,247,248,252,253,254,258,259,260,264,265,266,270,271,272,276,277,278,-1},
-  {243,244,245,249,250,251,255,256,257,261,262,263,267,268,269,273,274,275,279,280,281,-1},
-  {282,283,284,288,289,290,294,295,296,300,301,302,306,307,308,312,313,314,318,319,320,-1},
-  {285,286,287,291,292,293,297,298,299,303,304,305,309,310,311,315,316,317,321,322,323,-1},
-  {324,325,326,327,332,333,334,335,340,341,342,343,348,349,350,351,356,357,358,359,364,365},
-  {328,329,330,331,336,337,338,339,344,345,346,347,352,353,354,355,360,361,362,363,368,369},
-  {366,367,372,373,374,375,380,381,382,383,388,389,390,391,396,397,398,399,404,405,406,407},
-  {370,371,376,377,378,379,384,385,386,387,392,393,394,395,400,401,402,403,408,409,410,411},
-  {412,413,414,415,420,421,422,423,428,429,430,431,436,437,438,439,444,445,446,447,452,453},
-  {416,417,418,419,424,425,426,427,432,433,434,435,440,441,442,443,448,449,450,451,456,457},
-  {454,455,460,461,462,463,468,469,470,471,476,477,478,479,484,485,486,487,492,493,494,495},
-  {458,459,464,465,466,467,472,473,474,475,480,481,482,483,488,489,490,491,496,497,498,499}
-};
-
-
-AliITSRawStreamSDD::AliITSRawStreamSDD(AliRawReader* rawReader) :
-  AliITSRawStream(rawReader)
-{
-// create an object to read ITS SDD raw digits
-
-  fRawReader->Select(2);
-}
-
-
-Bool_t AliITSRawStreamSDD::Next()
-{
-// read the next raw digit
-// returns kFALSE if there is no digit left
-
-  fPrevModuleID = fModuleID;
-  if (!fRawReader->ReadNextInt(fData)) return kFALSE;
-
-  UInt_t relModuleID = (fData >> 25) & 0x0000007F;
-  fModuleID = fgkDDLModuleMap[fRawReader->GetDDLID()][relModuleID];
-  fCoord1 = (fData >> 16) & 0x000001FF;
-  fCoord2 = (fData >> 8) & 0x000000FF;
-  fSignal = fData & 0x000000FF;
-
-  return kTRUE;
-}
diff --git a/RAW/AliITSRawStreamSDD.h b/RAW/AliITSRawStreamSDD.h
deleted file mode 100644 (file)
index 29308c7..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef ALIITSRAWSTREAMSDD_H
-#define ALIITSRAWSTREAMSDD_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-
-///////////////////////////////////////////////////////////////////////////////
-///
-/// This class provides access to ITS SDD digits in raw data.
-///
-///////////////////////////////////////////////////////////////////////////////
-
-#include "AliITSRawStream.h"
-
-class AliRawReader;
-
-
-class AliITSRawStreamSDD: public AliITSRawStream {
-  public :
-    AliITSRawStreamSDD(AliRawReader* rawReader);
-    virtual ~AliITSRawStreamSDD() {};
-
-    virtual Bool_t   Next();
-
-    Int_t            GetAnode() const {return fCoord1;};
-    Int_t            GetTime() const {return fCoord2;};
-
-    enum {kDDLOffset = 0x200};    // offset for DDL numbers
-    enum {kDDLsNumber = 12};      // number of DDLs in SDD
-    enum {kModulesPerDDL = 22};   // number of modules in each DDL 
-
-    static Int_t     GetModuleNumber(UInt_t iDDL, UInt_t iModule)
-      {return fgkDDLModuleMap[iDDL][iModule];}
-
-  private :
-    static const Int_t fgkDDLModuleMap[kDDLsNumber][kModulesPerDDL];  // mapping DDL/module -> module number
-
-    UInt_t           fData;         // data read for file
-
-    ClassDef(AliITSRawStreamSDD, 0) // class for reading ITS SDD raw digits
-};
-
-#endif
diff --git a/RAW/AliITSRawStreamSDDv2.cxx b/RAW/AliITSRawStreamSDDv2.cxx
deleted file mode 100644 (file)
index 32a463d..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-/**************************************************************************
- * 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$ */
-
-///////////////////////////////////////////////////////////////////////////////
-///
-/// This class provides access to ITS SDD digits in test beam raw data.
-///
-///////////////////////////////////////////////////////////////////////////////
-
-#include "AliITSRawStreamSDDv2.h"
-#include "AliRawReader.h"
-
-ClassImp(AliITSRawStreamSDDv2)
-
-
-
-const UInt_t AliITSRawStreamSDDv2::fgkCodeLength[8] = 
-  {8, 18, 2, 3, 4, 5, 6, 7};
-
-
-AliITSRawStreamSDDv2::AliITSRawStreamSDDv2(AliRawReader* rawReader) :
-  AliITSRawStream(rawReader),
-  fSkip(0),
-  fEventId(-1),
-  fCarlosId(-1),
-  fChannel(-1)
-{
-// create an object to read ITS SDD raw digits
-
-  for (Int_t iChannel = 0; iChannel < 2; iChannel++) {
-    fChannelData[iChannel] = 0;
-    fLastBit[iChannel] = 0;
-    fChannelCode[iChannel] = 0;
-    fReadCode[iChannel] = kTRUE;
-    fReadBits[iChannel] = 3;
-    fTimeBin[iChannel] = 0;
-    fAnode[iChannel] = 0;
-    fLowThreshold[iChannel] = 0;
-  }
-
-  fRawReader->Reset();
-  fRawReader->SelectEquipment(17, 1, 1);
-}
-
-
-Bool_t AliITSRawStreamSDDv2::Next()
-{
-// read the next raw digit
-// returns kFALSE if there is no digit left
-
-  // skip the first 8 words
-  while (fSkip < 8) {
-    if (!fRawReader->ReadNextInt(fData)) return kFALSE;
-    if ((fData >> 30) == 0x01) continue;  // JTAG word
-    if (fSkip == 4) {
-      if (fData != 0) {
-       Error("Next", "data not valid: %8.8d", fData);
-       return kFALSE;
-      }
-    }
-    fSkip++;
-  }
-
-  while (kTRUE) {
-    if ((fChannel < 0) || (fLastBit[fChannel] < fReadBits[fChannel])) {
-      if (!fRawReader->ReadNextInt(fData)) return kFALSE;  // read next word
-
-      fChannel = -1;
-      if ((fData >> 28) == 0x02) {           // header
-       fEventId = (fData >> 3) & 0x07FF;
-       fCarlosId = (fData >> 1) & 0x03;
-      } else if ((fData >> 28) == 0x03) {    // footer
-       // ignored
-      } else if ((fData >> 29) == 0x00) {    // error
-       if ((fData & 0x1FFFFFFF) != 0) {
-         Error("Next", "error codes = %x, %x\n", 
-               (fData >> 0) & 0x3FFF, (fData >> 14) & 0x3FFF);
-         return kFALSE;
-       }
-      } else if ((fData >> 30) == 0x01) {    // JTAG word
-       // ignored
-      } else if ((fData >> 30) == 0x02) {    // channel 0 data
-       fChannel = 0;
-      } else if ((fData >> 30) == 0x03) {    // channel 1 data
-       fChannel = 1;
-      } else {                               // unknown data format
-       Error("Next", "invalid data: %8.8x\n", fData);
-       return kFALSE;
-      }
-
-      if (fChannel >= 0) {          // add read word to the data
-       fChannelData[fChannel] += 
-         (ULong64_t(fData & 0x3FFFFFFF) << fLastBit[fChannel]);
-       fLastBit[fChannel] += 30;
-      }
-
-    } else {  // decode data
-      if (fReadCode[fChannel]) {    // read the next code word
-       fChannelCode[fChannel] = ReadBits();
-       fReadCode[fChannel] = kFALSE;
-       fReadBits[fChannel] = fgkCodeLength[fChannelCode[fChannel]];
-
-      } else {                      // read the next data word
-       UInt_t data = ReadBits();
-       fReadCode[fChannel] = kTRUE;
-       fReadBits[fChannel] = 3;
-       if (fChannelCode[fChannel] == 0) {         // set the time bin
-         fTimeBin[fChannel] = data;
-       } else if (fChannelCode[fChannel] == 1) {  // next anode
-         fTimeBin[fChannel] = 0;
-         fAnode[fChannel]++;
-       } else {                                   // ADC signal data
-         fSignal = DecompAmbra(data + (1 << fChannelCode[fChannel]) + 
-           fLowThreshold[fChannel]);
-         fCoord1 = fAnode[fChannel];
-         fCoord2 = fTimeBin[fChannel];
-         fTimeBin[fChannel]++;
-         return kTRUE;
-       }
-      }
-    }
-  }
-
-  return kFALSE;
-}
-
-
-UInt_t AliITSRawStreamSDDv2::ReadBits()
-{
-// read bits from the given channel
-
-  UInt_t result = (fChannelData[fChannel] & ((1<<fReadBits[fChannel]) - 1));
-  fChannelData[fChannel] >>= fReadBits[fChannel]; 
-  fLastBit[fChannel] -= fReadBits[fChannel];
-  return result;
-}
-
-Int_t AliITSRawStreamSDDv2::DecompAmbra(Int_t value) const
-{
-// AMBRA decompression
-
-  if ((value & 0x80) == 0) {
-    return value & 0x7f;
-  } else if ((value & 0x40) == 0) {
-    return 0x081 + ((value & 0x3f) << 1);
-  } else if ((value & 0x20) == 0) {
-    return 0x104 + ((value & 0x1f) << 3);
-  } else {
-    return 0x208 + ((value & 0x1f) << 4);
-  }
-}
diff --git a/RAW/AliITSRawStreamSDDv2.h b/RAW/AliITSRawStreamSDDv2.h
deleted file mode 100644 (file)
index d8f4899..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef ALIITSRAWSTREAMSDDV2_H
-#define ALIITSRAWSTREAMSDDV2_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-
-///////////////////////////////////////////////////////////////////////////////
-///
-/// This class provides access to ITS SDD digits in test beam raw data.
-///
-///////////////////////////////////////////////////////////////////////////////
-
-#include "AliITSRawStream.h"
-
-class AliRawReader;
-
-
-class AliITSRawStreamSDDv2: public AliITSRawStream {
-  public :
-    AliITSRawStreamSDDv2(AliRawReader* rawReader);
-    virtual ~AliITSRawStreamSDDv2() {};
-
-    virtual Bool_t   Next();
-
-    Int_t            GetAnode() const {return fCoord1;};
-    Int_t            GetTimeBin() const {return fCoord2;};
-
-  private :
-    UInt_t           ReadBits();
-    Int_t            DecompAmbra(Int_t value) const;
-
-    UInt_t           fData;         // data read for file
-
-    static const UInt_t fgkCodeLength[8];  // length of coded data word
-    Int_t            fSkip;            // number of skipped words
-    Int_t            fEventId;         // event ID from the header
-    Int_t            fCarlosId;        // carlos ID from the header
-    Int_t            fChannel;         // current channel
-    ULong64_t        fChannelData[2];  // packed data for the 2 channels
-    UInt_t           fLastBit[2];      // last filled bit in fChannelData
-    UInt_t           fChannelCode[2];  // current channel code
-    Bool_t           fReadCode[2];     // next bits are code or data
-    UInt_t           fReadBits[2];     // number of bits to read
-    Int_t            fTimeBin[2];      // current time bin
-    Int_t            fAnode[2];        // current anode number
-    Int_t            fLowThreshold[2]; // low Carlos threshold
-
-    ClassDef(AliITSRawStreamSDDv2, 0) // class for reading ITS SDD raw digits
-};
-
-#endif
diff --git a/RAW/AliITSRawStreamSPD.cxx b/RAW/AliITSRawStreamSPD.cxx
deleted file mode 100644 (file)
index a0eb73d..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/**************************************************************************
- * 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$ */
-
-///////////////////////////////////////////////////////////////////////////////
-///
-/// This class provides access to ITS SPD digits in raw data.
-///
-///////////////////////////////////////////////////////////////////////////////
-
-#include "AliITSRawStreamSPD.h"
-#include "AliRawReader.h"
-
-ClassImp(AliITSRawStreamSPD)
-
-
-const Int_t AliITSRawStreamSPD::fgkDDLModuleMap[kDDLsNumber][kModulesPerDDL] = {
-  { 0, 1, 4, 5, 80, 81, 84, 85, 88, 89, 92, 93},
-  { 2, 3, 6, 7, 82, 83, 86, 87, 90, 91, 94, 95},
-  { 8, 9,12,13, 96, 97,100,101,104,105,108,109},
-  {10,11,14,15, 98, 99,102,103,106,107,110,111},
-  {16,17,20,21,112,113,116,117,120,121,124,125},
-  {18,19,22,23,114,115,118,119,122,123,126,127},
-  {24,25,28,29,128,129,132,133,136,137,140,141},
-  {26,27,30,31,130,131,134,135,138,139,142,143},
-  {32,33,36,37,144,145,148,149,152,153,156,157},
-  {34,35,38,39,146,147,150,151,154,155,158,159},
-  {40,41,44,45,160,161,164,165,168,169,172,173},
-  {42,43,46,47,162,163,166,167,170,171,174,175},
-  {48,49,52,53,176,177,180,181,184,185,188,189},
-  {50,51,54,55,178,179,182,183,186,187,190,191},
-  {56,57,60,61,192,193,196,197,200,201,204,205},
-  {58,59,62,63,194,195,198,199,202,203,206,207},
-  {64,65,68,69,208,209,212,213,216,217,220,221},
-  {66,67,70,71,210,211,214,215,218,219,222,223},
-  {72,73,76,77,224,225,228,229,232,233,236,237},
-  {74,75,78,79,226,227,230,231,234,235,238,239}
-};
-
-
-AliITSRawStreamSPD::AliITSRawStreamSPD(AliRawReader* rawReader) :
-  AliITSRawStream(rawReader),
-  fData(0),
-  fDDLNumber(-1),
-  fEventNumber(-1),
-  fModuleNumber(-1),
-  fOffset(0),
-  fHitCount(0)
-{
-// create an object to read ITS SPD raw digits
-
-  fRawReader->Select(1);
-}
-
-
-Bool_t AliITSRawStreamSPD::Next()
-{
-// read the next raw digit
-// returns kFALSE if there is no digit left
-
-  fPrevModuleID = fModuleID;
-  while (fRawReader->ReadNextShort(fData)) {
-  
-    if ((fData & 0xC000) == 0x4000) {           // header
-      fHitCount = 0;
-      UShort_t eventNumber = (fData >> 4) & 0x007F;
-      if (fEventNumber < 0) {
-       fEventNumber = eventNumber;
-      } else if (eventNumber != fEventNumber) {
-       Warning("Next", "mismatching event numbers: %d != %d", 
-               eventNumber, fEventNumber);
-      }
-      UShort_t chipAddr = fData & 0x000F;
-      if (fRawReader->GetDDLID() != fDDLNumber) {
-       fModuleNumber = -1;
-       fDDLNumber = fRawReader->GetDDLID();
-      }
-      if ((chipAddr == 5) || (chipAddr == 0)) {
-       fModuleNumber++;
-       while (fRawReader->TestBlockAttribute(fModuleNumber/2)) fModuleNumber++;
-      }
-      if (fDDLNumber < kDDLsNumber) {
-       fModuleID = fgkDDLModuleMap[fDDLNumber][fModuleNumber];
-      } else {
-       fModuleID = fModuleNumber;
-      }
-      fOffset = 32 * (chipAddr % 5);
-    } else if ((fData & 0xC000) == 0x0000) {    // trailer
-      UShort_t hitCount = fData & 0x1FFF;
-      if (hitCount != fHitCount) Error("Next", "wrong number of hits: %d != %d", fHitCount, hitCount);
-    } else if ((fData & 0xC000) == 0x8000) {    // pixel hit
-      fHitCount++;
-      fCoord1 = (fData & 0x001F) + fOffset;
-      fCoord2 = (fData >> 5) & 0x00FF;
-      return kTRUE;
-    } else {                                    // fill word
-      if ((fData & 0xC000) != 0xC000) Error("Next", "wrong fill word!");
-    }
-
-  }
-
-  return kFALSE;
-}
diff --git a/RAW/AliITSRawStreamSPD.h b/RAW/AliITSRawStreamSPD.h
deleted file mode 100644 (file)
index ee85836..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef ALIITSRAWSTREAMSPD_H
-#define ALIITSRAWSTREAMSPD_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-
-///////////////////////////////////////////////////////////////////////////////
-///
-/// This class provides access to ITS SPD digits in raw data.
-///
-///////////////////////////////////////////////////////////////////////////////
-
-#include "AliITSRawStream.h"
-
-
-class AliITSRawStreamSPD: public AliITSRawStream {
-  public :
-    AliITSRawStreamSPD(AliRawReader* rawReader);
-    virtual ~AliITSRawStreamSPD() {};
-
-    virtual Bool_t   Next();
-
-    Int_t            GetRow() const {return fCoord2;};
-    Int_t            GetColumn() const {return fCoord1;};
-
-    enum {kDDLOffset = 0x100};    // offset for DDL numbers
-    enum {kDDLsNumber = 20};      // number of DDLs in SPD
-    enum {kModulesPerDDL = 12};   // number of modules in each DDL
-
-    static Int_t     GetModuleNumber(UInt_t iDDL, UInt_t iModule)
-      {return fgkDDLModuleMap[iDDL][iModule];}
-
-  private :
-    static const Int_t fgkDDLModuleMap[kDDLsNumber][kModulesPerDDL];  // mapping DDL/module -> module number
-
-    UShort_t         fData;         // data read for file
-    Int_t            fDDLNumber;    // current DDL number
-    Int_t            fEventNumber;  // event trigger number
-    Int_t            fModuleNumber; // sequential module number
-    UInt_t           fOffset;       // offset for cell column
-    UInt_t           fHitCount;     // counter of hits
-
-    ClassDef(AliITSRawStreamSPD, 0) // class for reading ITS SPD raw digits
-};
-
-#endif
diff --git a/RAW/AliITSRawStreamSSD.cxx b/RAW/AliITSRawStreamSSD.cxx
deleted file mode 100644 (file)
index bb2b64a..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-/**************************************************************************
- * 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$ */
-
-///////////////////////////////////////////////////////////////////////////////
-///
-/// This class provides access to ITS SSD digits in raw data.
-///
-///////////////////////////////////////////////////////////////////////////////
-
-#include "AliITSRawStreamSSD.h"
-#include "AliRawReader.h"
-
-ClassImp(AliITSRawStreamSSD)
-
-
-const Int_t AliITSRawStreamSSD::fgkDDLModuleMap[kDDLsNumber][kModulesPerDDL] = {
-    //104
-    //DDL[32][]=
-    { 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510,
-      522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532,
-      1204,1205,1206,1207,1208,1209,1210,1211,1212,1213,1214,
-      1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,1236,
-      1248,1249,1250,1251,1252,1253,1254,1255,1256,1257,1258,1259,
-      2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,
-      2123,2124,2125,2126,2127,2128,2129,2130,2131,2132,2133,2134,
-      2148,2149,2150,2151,2152,2153,2154,2155,2156,2157,2158,2159,
-      2173,2174,2175,2176,2177,2178,2179,2180,2181,2182,2183,2184,-1,-1,-1,-1,-1},    
-    //93
-    //DDL[33][]=
-    { 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554,
-      566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576,
-      588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598,
-      610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620,
-      1273,1274,1275,1276,1277,1278,1279,1280,1281,1282,1283,1284,
-      1298,1299,1300,1301,1302,1303,1304,1305,1306,1307,1308,1309,
-      1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,
-      1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,
-      1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,-1,-1,-1,-1,-1},
-    //103
-    //DDL[34][]=
-    { 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642,
-      654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664,
-      676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686,
-      698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708,
-      720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730,
-      1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,
-      1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,
-      1448,1449,1450,1451,1452,1453,1454,1455,1456,1457,1458,1459,
-      1473,1474,1475,1476,1477,1478,1479,1480,1481,1482,1483,1484,-1,-1,-1,-1,-1,-1},
-    //104
-    //DDL[35][]=
-    { 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752,
-      764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774,
-      786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796,
-      808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818,
-      1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,
-      1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,
-      1548,1549,1550,1551,1552,1553,1554,1555,1556,1557,1558,1559,
-      1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,
-      1598,1599,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,-1,-1,-1,-1,-1},
-    //104
-    //DDL[36[]=
-    { 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, 840,
-      852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862,
-      874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884,
-      896, 897, 898, 899, 900, 901, 902, 903, 904, 905, 906,
-      1623,1624,1625,1626,1627,1628,1629,1630,1631,1632,1633,1634,
-      1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,
-      1673,1674,1675,1676,1677,1678,1679,1680,1681,1682,1683,1684,
-      1698,1699,1700,1701,1702,1703,1704,1705,1706,1707,1708,1709,
-      1723,1724,1725,1726,1727,1728,1729,1730,1731,1732,1733,1734,-1,-1,-1,-1,-1},
-    //104
-    //DDL[37][]=
-    { 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928,
-      940, 941, 942, 943, 944, 945, 946, 947, 948, 949, 950,
-      962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972,
-      984, 985, 986, 987, 988, 989, 990, 991, 992, 993, 994,
-      1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,
-      1773,1774,1775,1776,1777,1778,1779,1780,1781,1782,1783,1784,
-      1798,1799,1800,1801,1802,1803,1804,1805,1806,1807,1808,1809,
-      1823,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,
-      1848,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,-1,-1,-1,-1,-1},
-    //103
-    //DDL[38][]=
-    {1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,
-     1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,
-     1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,
-     1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,
-     1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,
-     1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,1884,
-     1898,1899,1900,1901,1902,1903,1904,1905,1906,1907,1908,1909,
-     1923,1924,1925,1926,1927,1928,1929,1930,1931,1932,1933,1934,
-     1948,1949,1950,1951,1952,1953,1954,1955,1956,1957,1958,1959,-1,-1,-1,-1,-1,-1},
-    //104
-    //DDL[39][]=
-    {1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,
-     1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,
-     1160,1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,
-     1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,
-     1973,1974,1975,1976,1977,1978,1979,1980,1981,1982,1983,1984,
-     1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,
-     2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,
-     2048,2049,2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,
-     2073,2074,2075,2076,2077,2078,2079,2080,2081,2082,2083,2084,-1,-1,-1,-1,-1},
-    //109
-    //DDL[40][]=
-    { 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521,
-      533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543,
-      1215,1216,1217,1218,1219,1220,1221,1222,1223,1224,1225,
-      1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,
-      1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1270,1271,1272,
-      2110,2111,2112,2113,2114,2115,2116,2117,2118,2119,2120,2121,2122,
-      2135,2136,2137,2138,2139,2140,2141,2142,2143,2144,2145,2146,2147,
-      2160,2161,2162,2163,2164,2165,2166,2167,2168,2169,2170,2171,2172,
-      2185,2186,2187,2188,2189,2190,2191,2192,2193,2194,2195,2196,2197},
-    //109
-    //DDL[41][]=
-    { 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565,
-      577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587,
-      599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609,
-      621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
-      1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,
-      1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,
-      1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,
-      1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,
-      1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397},
-    //107
-    //DDL[42][]=
-    { 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653,
-      665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
-      687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697,
-      709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719,
-      731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741,
-      1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,
-      1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,
-      1460,1461,1462,1463,1464,1465,1466,1467,1468,1469,1470,1471,1472,
-      1485,1486,1487,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,-1,-1},
-    //109
-    //DDL[43][]=
-    { 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763,
-      775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785,
-      797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807,
-      819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829,
-      1510,1511,1512,1513,1514,1515,1516,1517,1518,1519,1520,1521,1522,
-      1535,1536,1537,1538,1539,1540,1541,1542,1543,1544,1545,1546,1547,
-      1560,1561,1562,1563,1564,1565,1566,1567,1568,1569,1570,1571,1572,
-      1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595,1596,1597,
-      1610,1611,1612,1613,1614,1615,1616,1617,1618,1619,1620,1621,1622},
-    //109
-    //DDL[44][]=
-    { 841, 842, 843, 844, 845, 846, 847, 848, 849, 850, 851,
-      863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873,
-      885, 886, 887, 888, 889, 890, 891, 892, 893, 894, 895,
-      907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917,
-      1635,1636,1637,1638,1639,1640,1641,1642,1643,1644,1645,1646,1647,
-      1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,
-      1685,1686,1687,1688,1689,1690,1691,1692,1693,1694,1695,1696,1697,
-      1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,1720,1721,1722,
-      1735,1736,1737,1738,1739,1740,1741,1742,1743,1744,1745,1746,1747},
-    //109
-    //DDL[45][]=
-    {929, 930, 931, 932, 933, 934, 935, 936, 937, 938, 939,
-     951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961,
-     973, 974, 975, 976, 977, 978, 979, 980, 981, 982, 983,
-     995, 996, 997, 998, 999,1000,1001,1002,1003,1004,1005,
-     1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,
-     1785,1786,1787,1788,1789,1790,1791,1792,1793,1794,1795,1796,1797,
-     1810,1811,1812,1813,1814,1815,1816,1817,1818,1819,1820,1821,1822,
-     1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,
-     1860,1861,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872},
-    //109
-    //DDL[46][]=
-    {1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,
-     1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,
-     1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,
-     1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,
-     1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,
-     1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,
-     1910,1911,1912,1913,1914,1915,1916,1917,1918,1919,1920,1921,1922,
-     1935,1936,1937,1938,1939,1940,1941,1942,1943,1944,1945,1946,1947,
-     1960,1961,1962,1963,1964,1965,1966,1967,1968,1969,1970,1971,1972},
-    //109
-    //DDL[47][]=
-    {1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,
-     1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,
-     1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,
-     1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,
-     1985,1986,1987,1988,1989,1990,1991,1992,1993,1994,1995,1996,1997,
-     2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,
-     2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,
-     2060,2061,2062,2063,2064,2065,2066,2067,2068,2069,2070,2071,2072,
-     2085,2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097} 
-};
-
-
-AliITSRawStreamSSD::AliITSRawStreamSSD(AliRawReader* rawReader) :
-  AliITSRawStream(rawReader)
-{
-// create an object to read ITS SSD raw digits
-
-  fRawReader->Select(3);
-}
-
-
-Bool_t AliITSRawStreamSSD::Next()
-{
-// read the next raw digit
-// returns kFALSE if there is no digit left
-
-  fPrevModuleID = fModuleID;
-  if (!fRawReader->ReadNextInt(fData)) return kFALSE;
-  
-  UInt_t relModuleID = (fData >> 21) & 0x000007FF;
-  fModuleID = fgkDDLModuleMap[fRawReader->GetDDLID()][relModuleID];
-  fCoord1 = (fData >> 20) & 0x00000001;
-  fCoord2 = (fData >> 10) & 0x000003FF;
-  fSignal = (fData & 0x000003FF) + 1;
-
-  return kTRUE;
-}
diff --git a/RAW/AliITSRawStreamSSD.h b/RAW/AliITSRawStreamSSD.h
deleted file mode 100644 (file)
index 79e15ec..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef ALIITSRAWSTREAMSSD_H
-#define ALIITSRAWSTREAMSSD_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-
-///////////////////////////////////////////////////////////////////////////////
-///
-/// This class provides access to ITS SSD digits in raw data.
-///
-///////////////////////////////////////////////////////////////////////////////
-
-#include "AliITSRawStream.h"
-
-class AliRawReader;
-
-
-class AliITSRawStreamSSD: public AliITSRawStream {
-  public :
-    AliITSRawStreamSSD(AliRawReader* rawReader);
-    virtual ~AliITSRawStreamSSD() {};
-
-    virtual Bool_t   Next();
-
-    Int_t            GetSideFlag() const {return fCoord1;};
-    Int_t            GetStrip() const {return fCoord2;};
-
-    enum {kDDLOffset = 0x300};    // offset for DDL numbers
-    enum {kDDLsNumber = 16};      // number of DDLs in SSD
-    enum {kModulesPerDDL = 109};  // number of modules in each DDL
-
-    static Int_t     GetModuleNumber(UInt_t iDDL, UInt_t iModule)
-      {return fgkDDLModuleMap[iDDL][iModule];}
-
-  private :
-    static const Int_t fgkDDLModuleMap[kDDLsNumber][kModulesPerDDL];  // mapping DDL/module -> module number
-
-    UInt_t           fData;         // data read for file
-
-    ClassDef(AliITSRawStreamSSD, 0) // class for reading ITS SSD raw digits
-};
-
-#endif
index 84cc585..3770be4 100644 (file)
 #pragma link C++ class AliTPCHTable+;
 #pragma link C++ class AliAltroRawStream+;
 #pragma link C++ class AliTPCRawStream+;
-#pragma link C++ class AliITSRawStream+;
-#pragma link C++ class AliITSRawStreamSPD+;
-#pragma link C++ class AliITSRawStreamSDD+;
-#pragma link C++ class AliITSRawStreamSSD+;
-#pragma link C++ class AliITSRawStreamSDDv2+;
 #pragma link C++ class AliVMERawStream+;
 
 #endif
index b75a6bc..6c9de98 100644 (file)
@@ -15,9 +15,7 @@ SRCS:=  AliRawEventHeader.cxx AliRawEquipmentHeader.cxx \
        AliBitPacking.cxx AliAltroBuffer.cxx \
        AliTPCCompression.cxx AliTPCHNode.cxx AliTPCHTable.cxx \
        AliAltroRawStream.cxx AliTPCRawStream.cxx \
-       AliITSRawStream.cxx AliITSRawStreamSPD.cxx \
-       AliITSRawStreamSDD.cxx AliITSRawStreamSSD.cxx \
-       AliITSRawStreamSDDv2.cxx AliVMERawStream.cxx
+       AliVMERawStream.cxx
 
 HDRS:= $(SRCS:.cxx=.h)