Raw data simulation, one file per DDL, mini header replaced by data header (T.Kuhr)

diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx
index 850fea285441af87a7ae193ae7bd3fa6487fdb20..c63ac6478c3c065f4e8bd987a4f46c58106db257 100644 (file)
--- a/ITS/AliITS.cxx
+++ b/ITS/AliITS.cxx
@@ -110,6 +110,7 @@ the AliITS class.
 #include "AliITSsimulationSSD.h"
 #include "AliMC.h"
 #include "AliITSDigitizer.h"
+#include "AliITSDDLRawData.h"
 #include "AliITSclustererV2.h"
 #include "AliITStrackerV2.h"
 #include "AliITStrackerSA.h"
@@ -1389,6 +1390,46 @@ void AliITS::AddSimDigit(Int_t id,Float_t phys,Int_t *digits,Int_t *tracks,
     break;
   } // end switch id
 }
+
+//______________________________________________________________________
+void AliITS::Digits2Raw()
+{
+// convert digits of the current event to raw data
+
+  fLoader->LoadDigits();
+  TTree* digits = fLoader->TreeD();
+  if (!digits) {
+    Error("Digits2Raw", "no digits tree");
+    return;
+  }
+  SetTreeAddressD(digits);
+
+  AliITSDDLRawData rawWriter;
+  //Verbose level
+  // 0: Silent
+  // 1: cout messages
+  // 2: txt files with digits 
+  //BE CAREFUL, verbose level 2 MUST be used only for debugging and
+  //it is highly suggested to use this mode only for debugging digits files
+  //reasonably small, because otherwise the size of the txt files can reach
+  //quickly several MB wasting time and disk space.
+  rawWriter.SetVerbose(0);
+    
+  //SILICON PIXEL DETECTOR
+  Info("Digits2Raw", "Formatting raw data for SPD");
+  rawWriter.RawDataSPD(digits->GetBranch("ITSDigitsSPD"));
+    
+  //SILICON DRIFT DETECTOR
+  Info("Digits2Raw", "Formatting raw data for SDD");
+  rawWriter.RawDataSDD(digits->GetBranch("ITSDigitsSDD"));
+    
+  //SILICON STRIP DETECTOR
+  Info("Digits2Raw", "Formatting raw data for SSD");
+  rawWriter.RawDataSSD(digits->GetBranch("ITSDigitsSSD"));
+
+  fLoader->UnloadDigits();
+}
+
 //______________________________________________________________________
 void AliITS::MakeTreeC(Option_t *option){
   //   Create a separate tree to store the clusters.

diff --git a/ITS/AliITS.h b/ITS/AliITS.h
index 5709f68d64e06e9764d17f3c86c6bd8963d47d3f..bf994860263dbad6370498e29d76df49f07e1634 100644 (file)
--- a/ITS/AliITS.h
+++ b/ITS/AliITS.h
@@ -151,9 +151,7 @@ class AliITS : public AliDetector {
 
     //===================== Raw Data IO ================================
     // Write digits into raw data format
-    virtual void Digits2RawData() {}
-    // Decode raw data and store digits
-    virtual void RawData2Digits() {}
+    virtual void Digits2Raw();
 
     //==================== Clusterization ==============================
     // create separate tree for clusters - declustering refining

diff --git a/ITS/AliITSDDLRawData.cxx b/ITS/AliITSDDLRawData.cxx
index 0afd33d4a227e07f20acb77aa30db6c5822cb980..def70257fe15bd910096f77e00bcfa53963d9226 100644 (file)
--- a/ITS/AliITSDDLRawData.cxx
+++ b/ITS/AliITSDDLRawData.cxx
@@ -33,6 +33,10 @@
 #include "AliITSdigitSDD.h"
 #include "AliITSdigitSSD.h"
 #include "AliITSDDLRawData.h"
+#include "AliRawDataHeader.h"
+#include "AliITSRawStreamSPD.h"
+#include "AliITSRawStreamSDD.h"
+#include "AliITSRawStreamSSD.h"
 
 ClassImp(AliITSDDLRawData)
 
@@ -135,7 +139,7 @@ void AliITSDDLRawData::GetDigitsSDD(TClonesArray *ITSdigits,Int_t mod,Int_t modR
       if (fVerbose==2)
        ftxt<<"DDL:"<<ddl<<" MID:"<<modR<<" An:"<<iz<<" T:"<<ix<<" A:"<<is<<endl;
       //      cout<<"Amplitude value:"<<is<<" Time Bucket:"<<ix<<" Anode:"<<iz<<endl;
-      if (is>255){cout<<"WARNING (!) bits words is needed)!!!\n";}
+      if (is>255){Error("GetDigitsSDD", "bits words is needed)!!!");}
       baseWord=0;
       /*
       //10 bits words for amplitude value
@@ -286,9 +290,9 @@ void AliITSDDLRawData::PackWord(UInt_t &BaseWord, UInt_t Word, Int_t StartBit, I
   length=StopBit-StartBit+1;
   sum=(UInt_t)TMath::Power(2,length)-1;
   if(Word > sum){
-    cout<<"WARNING::Word to be filled is not within desired length"<<endl;
-    cout<<"Word:"<<Word<<" Start bit:"<<StartBit<<" Stop Bit:"<<StopBit<<endl;
-    exit(-1);
+    Error("PackWord", "Word to be filled is not within desired length\n"
+         "Word:%d Start bit:%d Stop Bit:%d",Word,StartBit,StopBit);
+    return;
   }
   offSet=sum;
   offSet<<=StartBit;
@@ -320,82 +324,36 @@ void AliITSDDLRawData::UnpackWord(UInt_t PackedWord, Int_t StartBit, Int_t StopB
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-Int_t AliITSDDLRawData::RawDataSPD(AliITS *ITS,TTree *TD ,Int_t LDCsNumber,Int_t eventNumber){
+Int_t AliITSDDLRawData::RawDataSPD(TBranch* branch){
   //This method creates the Raw data files for SPD detectors
-  //Silicon Pixel Detector
-  const Int_t kDDLsNumber=20;       // Number of DDL in SPD
-  const Int_t kModulesPerDDL=12;    // Number of modules in each DDL 
-  //Row    ==> DDLs
-  //Column ==> Modules
-  Int_t mapSPD[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}};
-  Int_t ddlsPerFile=kDDLsNumber/LDCsNumber;
-  if(kDDLsNumber%LDCsNumber)ddlsPerFile++;
-  if(fVerbose)
-    cout<<"Number of DDL per File: "<<ddlsPerFile<<endl;
-  Int_t subd=0;
-  Int_t countDDL=0;
-  Int_t sliceNumber=1;
   const Int_t kSize=21000; //256*32*5=40960 max number of digits per module
   UInt_t buf[kSize];      //One buffer cell can contain 2 digits 
   fIndex=-1;
-  TClonesArray *digitsInITS  = ITS->DigitsAddress(subd);
 
-  Int_t nbytes = 0; 
+  TClonesArray*& digits = * (TClonesArray**) branch->GetAddress();
   char fileName[15];
-
-  UInt_t miniHeaderPosition=0; //variable used to store the position of the Mini Header inside a file
   ofstream outfile;         // logical name of the output file 
-  Int_t flag=0;             // 0==> Uncompressed data 1==>Compressed Data
-  Int_t detector=1;         // 1==>ITS (Pixel) 2==>ITS (Drift) 3==>ITS (Strip) 0==>TPC ......
-  UInt_t size=0;           // size of the data block that follows the mini header
-  Int_t magicWord=0x123456;  // Magic word used to distinguish between data and garbage
-  sprintf(fileName,"Ev%dSPDslice%d",eventNumber,sliceNumber); //The name of  the output file. There are as many slides as the number of LDC
+  AliRawDataHeader header;
+
+  //loop over DDLs
+  for(Int_t i=0;i<AliITSRawStreamSPD::kDDLsNumber;i++){
+    sprintf(fileName,"ITSSPD_%d.ddl",i+AliITSRawStreamSPD::kDDLOffset); //The name of the output file.
 #ifndef __DECCXX
-  outfile.open(fileName,ios::binary);
+    outfile.open(fileName,ios::binary);
 #else
-  outfile.open(fileName);
+    outfile.open(fileName);
 #endif
-  UInt_t miniHeader[3];
-  Int_t miniHeaderSize=sizeof(UInt_t)*3;
-  Int_t version=1;          //version of the mini header 
-  //loop over DDLs
-  for(Int_t i=0;i<kDDLsNumber;i++){
-    countDDL++;
-    //write Dummy MINI HEADER
-    miniHeader[0]=size;
-    PackWord(miniHeader[1],magicWord,8,31);
-    PackWord(miniHeader[1],detector,0,7);
-    PackWord(miniHeader[2],i,16,31);
-    PackWord(miniHeader[2],flag,8,15);
-    PackWord(miniHeader[2],version,0,7);
-    miniHeaderPosition=outfile.tellp();
-    outfile.write((char*)(miniHeader),miniHeaderSize);
+    //write Dummy DATA HEADER
+    UInt_t dataHeaderPosition=outfile.tellp();
+    outfile.write((char*)(&header),sizeof(header));
     //Loops over Modules of a particular DDL
-    for (Int_t mod=0; mod<kModulesPerDDL; mod++){
-      ITS->ResetDigits();
-      nbytes += TD->GetEvent(mapSPD[i][mod]);
+    for (Int_t mod=0; mod<AliITSRawStreamSPD::kModulesPerDDL; mod++){
+      Int_t moduleNumber = AliITSRawStreamSPD::GetModuleNumber(i, mod);
+      digits->Clear();
+      branch->GetEvent(moduleNumber);
       //For each Module, buf contains the array of data words in Binary format   
       //fIndex gives the number of 32 bits words in the buffer for each module
-      GetDigitsSPD(digitsInITS,mapSPD[i][mod],i,buf);
+      GetDigitsSPD(digits,moduleNumber,i,buf);
       outfile.write((char *)buf,((fIndex+1)*sizeof(UInt_t)));
       for(Int_t i=0;i<(fIndex+1);i++){
        buf[i]=0;
@@ -403,402 +361,118 @@ Int_t AliITSDDLRawData::RawDataSPD(AliITS *ITS,TTree *TD ,Int_t LDCsNumber,Int_t
       fIndex=-1;
     }//end for
     
-    //Write REAL MINI HEADER
+    //Write REAL DATA HEADER
     UInt_t currentFilePosition=outfile.tellp();
-    outfile.seekp(miniHeaderPosition);
-    size=currentFilePosition-miniHeaderPosition-miniHeaderSize;
-    
-    outfile.write((char*)(&size),sizeof(UInt_t));
-    outfile.seekp(currentFilePosition);
-    if(countDDL==ddlsPerFile){
-      outfile.close();
-      sliceNumber++;
-      sprintf(fileName,"Ev%dSPDslice%d",eventNumber,sliceNumber); 
-      if(i!=(kDDLsNumber-1))
-#ifndef __DECCXX
-       outfile.open(fileName,ios::binary);
-#else
-       outfile.open(fileName);
-#endif
-      countDDL=0;
-    }//end if
+    outfile.seekp(dataHeaderPosition);
+    header.fSize=currentFilePosition-dataHeaderPosition;
+    header.SetAttribute(0);  // valid data
+    outfile.write((char*)(&header),sizeof(header));
+    outfile.close();
   }//end for
-  outfile.close();
+
   return 0;  
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-Int_t AliITSDDLRawData::RawDataSSD(AliITS *ITS,TTree *TD ,Int_t LDCsNumber,Int_t eventNumber){
+Int_t AliITSDDLRawData::RawDataSSD(TBranch* branch){
   //This method creates the Raw data files for SSD detectors
-  //Strip detector
-  const Int_t kDDLsNumber=16;        // Number of DDL in SSD
-  const Int_t kModulesPerDDL=109;    // Number of modules in each DDL 
-  //DDL from 32 to 47 (16 DDL)
-  //Row    ==> DDLs
-  //Column ==> Modules
-  Int_t mapSSD[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} };
-
-
-  Int_t ddlsPerFile=kDDLsNumber/LDCsNumber;
-  if(kDDLsNumber%LDCsNumber)ddlsPerFile++;
-  if(fVerbose)
-    cout<<"Number of DDL per File: "<<ddlsPerFile<<endl;
-  Int_t subd=2;          //SSD
-  Int_t countDDL=0;
-  Int_t sliceNumber=1;
   const Int_t kSize=1536;//768*2 Number of stripe * number of sides(N and P)
   UInt_t buf[kSize];      
   fIndex=-1;
-  Int_t nbytes = 0; 
-  TClonesArray *digitsInITS  = ITS->DigitsAddress(subd);
+
+  TClonesArray*& digits = * (TClonesArray**) branch->GetAddress();
   char fileName[15];
+  ofstream outfile;         // logical name of the output file 
+  AliRawDataHeader header;
 
-  UInt_t miniHeaderPosition=0; //variable used to store the position of the Mini Header inside the file
-  ofstream outfile;             // logical name of the output file 
-  Int_t flag=0;                 // 0==> Uncompressed data 1==>Compressed Data
-  Int_t detector=3;             // 1==>ITS (Pixel) 2==>ITS (Drift) 3==>ITS (Strip) 0==>TPC ......
-  UInt_t size=0;               // size of the data block that follows the mini header
-  Int_t magicWord=0x123456;     // Magic word used to distinguish between data and garbage
-  sprintf(fileName,"Ev%dSSDslice%d",eventNumber,sliceNumber); //The name of  the output file. There are as many slides as the number of LDC
+  //loop over DDLs  
+  for(Int_t i=0;i<AliITSRawStreamSSD::kDDLsNumber;i++){
+    sprintf(fileName,"ITSSSD_%d.ddl",i+AliITSRawStreamSSD::kDDLOffset); //The name of the output file
 #ifndef __DECCXX
-  outfile.open(fileName,ios::binary);
+    outfile.open(fileName,ios::binary);
 #else
-  outfile.open(fileName);
+    outfile.open(fileName);
 #endif
-  UInt_t miniHeader[3];
-  Int_t miniHeaderSize=sizeof(UInt_t)*3;
-  Int_t version=1;              //version of the mini header 
-  //loop over DDLs
-  
-  for(Int_t i=0;i<kDDLsNumber;i++){
-    countDDL++;
-    //write Dummy MINI HEADER
-    miniHeader[0]=size;
-    PackWord(miniHeader[1],magicWord,8,31);
-    PackWord(miniHeader[1],detector,0,7);
-    PackWord(miniHeader[2],i,16,31);
-    PackWord(miniHeader[2],flag,8,15);
-    PackWord(miniHeader[2],version,0,7);
-    miniHeaderPosition=outfile.tellp();
-    outfile.write((char*)(miniHeader),miniHeaderSize);
+    //write Dummy DATA HEADER
+    UInt_t dataHeaderPosition=outfile.tellp();
+    outfile.write((char*)(&header),sizeof(header));
     
     //Loops over Modules of a particular DDL
-    for (Int_t mod=0; mod<kModulesPerDDL; mod++){
-      if(mapSSD[i][mod]!=-1){
-       ITS->ResetDigits();
-       nbytes += TD->GetEvent(mapSSD[i][mod]);
+    for (Int_t mod=0; mod<AliITSRawStreamSSD::kModulesPerDDL; mod++){
+      Int_t moduleNumber = AliITSRawStreamSSD::GetModuleNumber(i, mod);
+      if(moduleNumber!=-1){
+       digits->Clear();
+       branch->GetEvent(moduleNumber);
        //For each Module, buf contains the array of data words in Binary format          
        //fIndex gives the number of 32 bits words in the buffer for each module
-       GetDigitsSSD(digitsInITS,mod,mapSSD[i][mod],i,buf);
+       GetDigitsSSD(digits,mod,moduleNumber,i,buf);
        outfile.write((char *)buf,((fIndex+1)*sizeof(UInt_t)));
-       for(Int_t i=0;i<(fIndex+1);i++){
-         buf[i]=0;
-       }//end for
        fIndex=-1;
       }//end if
     }//end for
-    //Write REAL MINI HEADER
+
+    //Write REAL DATA HEADER
     UInt_t currentFilePosition=outfile.tellp();
-    outfile.seekp(miniHeaderPosition);
-    size=currentFilePosition-miniHeaderPosition-miniHeaderSize;
-    
-    outfile.write((char*)(&size),sizeof(UInt_t));
-    outfile.seekp(currentFilePosition);
-    if(countDDL==ddlsPerFile){
-      outfile.close();
-      sliceNumber++;
-      sprintf(fileName,"Ev%dSSDslice%d",eventNumber,sliceNumber); 
-      if(i!=(kDDLsNumber-1))
-#ifndef __DECCXX
-       outfile.open(fileName,ios::binary);
-#else
-       outfile.open(fileName);
-#endif
-      countDDL=0;
-    }//end if
+    outfile.seekp(dataHeaderPosition);
+    header.fSize=currentFilePosition-dataHeaderPosition;
+    header.SetAttribute(0);  // valid data
+    outfile.write((char*)(&header),sizeof(header));
+    outfile.close();
   }//end for
-  outfile.close();
+
   return 0;  
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-Int_t AliITSDDLRawData::RawDataSDD(AliITS *ITS,TTree *TD ,Int_t LDCsNumber,Int_t eventNumber){
+Int_t AliITSDDLRawData::RawDataSDD(TBranch* branch){
     //This method creates the Raw data files for SDD detectors
-  //Silicon Drift detector
-  const Int_t kDDLsNumber=12;       // Number of DDL in SPD
-  const Int_t kModulesPerDDL=22;    // Number of modules in each DDL 
-  //Row    ==> DDLs
-  //Column ==> Modules  
-  Int_t mapSDD[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}};
-  
-  Int_t ddlsPerFile=kDDLsNumber/LDCsNumber;
-  if(kDDLsNumber%LDCsNumber)ddlsPerFile++;
-  if(fVerbose)
-    cout<<"Number of DDL per File: "<<ddlsPerFile<<endl;
-  Int_t subd=1;
-  Int_t countDDL=0;
-  Int_t sliceNumber=1;
   const Int_t kSize=131072; //256*512
   UInt_t buf[kSize];      
   fIndex=-1;
-  Int_t nbytes = 0; 
-  TClonesArray *digitsInITS  = ITS->DigitsAddress(subd);
-  char fileName[15];
 
-  UInt_t miniHeaderPosition=0; // variable used to store the position of the Mini Header inside a file
+  TClonesArray*& digits = * (TClonesArray**) branch->GetAddress();
+  char fileName[15];
   ofstream outfile;             // logical name of the output file 
-  Int_t flag=0;                 // 0==> Uncompressed data 1==>Compressed Data
-  Int_t detector=2;             // 1==>ITS (Pixel) 2==>ITS (Drift) 3==>ITS (Strip) 0==>TPC ......
-  UInt_t size=0;               // size of the data block that follows the mini header
-  Int_t magicWord=0x123456;     // Magic word used to distinguish between data and garbage
-  sprintf(fileName,"Ev%dSDDslice%d",eventNumber,sliceNumber); //The name of  the output file. There are as many slides as the number of LDC
+  AliRawDataHeader header;
+
+  //loop over DDLs  
+  for(Int_t i=0;i<AliITSRawStreamSDD::kDDLsNumber;i++){
+    sprintf(fileName,"ITSSDD_%d.ddl",i+AliITSRawStreamSDD::kDDLOffset); //The name of the output file
 #ifndef __DECCXX
-  outfile.open(fileName,ios::binary);
+    outfile.open(fileName,ios::binary);
 #else
-  outfile.open(fileName);
+    outfile.open(fileName);
 #endif
-  UInt_t miniHeader[3];
-  Int_t miniHeaderSize=sizeof(UInt_t)*3;
-  Int_t version=1;             //version of the mini header 
-  //loop over DDLs
-  for(Int_t i=0;i<kDDLsNumber;i++){
-    countDDL++;
-    //write Dummy MINI HEADER
-    miniHeader[0]=size;
-    PackWord(miniHeader[1],magicWord,8,31);
-    PackWord(miniHeader[1],detector,0,7);
-    PackWord(miniHeader[2],i,16,31);
-    PackWord(miniHeader[2],flag,8,15);
-    PackWord(miniHeader[2],version,0,7);
-    miniHeaderPosition=outfile.tellp();
-    outfile.write((char*)(miniHeader),miniHeaderSize);
+    //write Dummy DATA HEADER
+    UInt_t dataHeaderPosition=outfile.tellp();
+    outfile.write((char*)(&header),sizeof(header));
+
     //Loops over Modules of a particular DDL
-    for (Int_t mod=0; mod<kModulesPerDDL; mod++){
-      if(mapSDD[i][mod]!=-1){
-       ITS->ResetDigits();
-       nbytes += TD->GetEvent(mapSDD[i][mod]);
+    for (Int_t mod=0; mod<AliITSRawStreamSDD::kModulesPerDDL; mod++){
+      Int_t moduleNumber = AliITSRawStreamSDD::GetModuleNumber(i, mod);
+      if(moduleNumber!=-1){
+       digits->Clear();
+       branch->GetEvent(moduleNumber);
        //For each Module, buf contains the array of data words in Binary format          
        //fIndex gives the number of 32 bits words in the buffer for each module
        //      cout<<"MODULE NUMBER:"<<mapSDD[i][mod]<<endl;
-       GetDigitsSDD(digitsInITS,mod,mapSDD[i][mod],i,buf);
+       GetDigitsSDD(digits,mod,moduleNumber,i,buf);
        outfile.write((char *)buf,((fIndex+1)*sizeof(UInt_t)));
-       for(Int_t i=0;i<(fIndex+1);i++){
-         buf[i]=0;
-       }//end for
        fIndex=-1;
       }//end if
     }//end for
     
-    //Write REAL MINI HEADER
+    //Write REAL DATA HEADER
     UInt_t currentFilePosition=outfile.tellp();
-    outfile.seekp(miniHeaderPosition);
-    size=currentFilePosition-miniHeaderPosition-miniHeaderSize;
-    
-    outfile.write((char*)(&size),sizeof(UInt_t));
-    outfile.seekp(currentFilePosition);
-    if(countDDL==ddlsPerFile){
-      outfile.close();
-      sliceNumber++;
-      sprintf(fileName,"Ev%dSDDslice%d",eventNumber,sliceNumber); 
-      if(i!=(kDDLsNumber-1))
-#ifndef __DECCXX
-       outfile.open(fileName,ios::binary);
-#else
-       outfile.open(fileName);
-#endif
-      countDDL=0;
-    }//end if
+    outfile.seekp(dataHeaderPosition);
+    header.fSize=currentFilePosition-dataHeaderPosition;
+    header.SetAttribute(0);  // valid data
+    outfile.write((char*)(&header),sizeof(header));
+    outfile.close();
   }//end for
-  outfile.close();
+
   return 0;  
 }
 
@@ -825,7 +499,7 @@ void AliITSDDLRawData::ReadChipHeader(Int_t &ChipAddr,Int_t &EventCnt,UInt_t Bas
   UnpackWord(BaseWord,4,10,temp);
   EventCnt=(Int_t)temp;
   if(fVerbose)
-    cout<<"Chip: "<<ChipAddr<<" Half Stave module:"<<EventCnt<<endl;
+    Info("ReadChipHeader", "Chip:&d Half Stave module:%d",ChipAddr,EventCnt);
   return;
 }//end ReadChipHeader
 
@@ -875,92 +549,3 @@ void  AliITSDDLRawData::WriteHit(UInt_t *buf,Int_t RowAddr,Int_t HitAddr,UInt_t
   return;
 }//end WriteHit
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void AliITSDDLRawData::TestFormat(Int_t eventNumber){
-  //This method generates a text file containing SPD information
-  //Used for debugging
-  ifstream f;
-  Int_t  ldcsNumber=2;
-  ofstream ftxt("File2.txt");
-  UInt_t size=0;
-  char filename[15];
-  UInt_t ddlsNumber=0;
-  UInt_t miniHeader[3];
-  Int_t miniHeaderSize=sizeof(UInt_t)*3;
-  for(Int_t i=1;i<=ldcsNumber;i++){
-    sprintf(filename,"Ev%dSPDslice%d",eventNumber,i);  
-#ifndef __DECCXX
-    f.open(filename,ios::binary|ios::in);
-#else
-    f.open(filename,ios::in);
-#endif
-    if(!f){exit(1);}
-    //loop over the DDL block 
-    //here the Mini Header is read
-    while( f.read((char*)(miniHeader),miniHeaderSize)){
-      //cout<<"Block Size: "<<size<<endl;
-      size=miniHeader[0];
-      UnpackWord(miniHeader[2],16,31,ddlsNumber);
-      //ftxt<<"DDL NUMBER:"<<ddlsNumber<<endl;
-      UInt_t word=0;
-      UInt_t codeH,codeL=0;
-      UInt_t chip=0;
-      UInt_t half=0;
-      UInt_t col=0;
-      UInt_t row=0;
-      Int_t moduleID=0;
-      UInt_t hitscount=0;
-      Int_t previous=-1;
-      for(UInt_t j=0;j<(size/4);j++){
-       f.read((char*)(&word),sizeof(word)); //32 bits word
-       UnpackWord(word,30,31,codeH);
-       UnpackWord(word,14,15,codeL);
-       if ((codeH==2)&&(codeL==1)){
-         UnpackWord(word,0,3,chip);
-         UnpackWord(word,4,10,half);
-         moduleID=half*2+chip/5;
-         if (moduleID!=previous){
-           if (hitscount){
-             previous=moduleID;
-             hitscount=0;
-           }
-         }
-         chip=chip%5;
-         row=col=0;
-         UnpackWord(word,21,28,row);
-         UnpackWord(word,16,20,col); 
-         col=col+32*chip;
-         hitscount++;
-         ftxt<<"DDL:"<<ddlsNumber<<" Mod:"<<moduleID<<" Row:"<<row<<" Col:"<<col<<endl;
-       }//end if
-       else if ((codeH==2)&&(codeL==2)){
-         row=col=0;
-         UnpackWord(word,5,12,row);
-         UnpackWord(word,0,4,col);
-         col=col+32*chip;
-         ftxt<<"DDL:"<<ddlsNumber<<" Mod:"<<moduleID<<" Row:"<<row<<" Col:"<<col<<endl;
-         row=col=0;
-         UnpackWord(word,21,28,row);
-         UnpackWord(word,16,20,col); 
-         col=col+32*chip;
-         ftxt<<"DDL:"<<ddlsNumber<<" Mod:"<<moduleID<<" Row:"<<row<<" Col:"<<col<<endl;
-         hitscount++;
-         hitscount++;
-       }//end else if
-       else if ((codeH==0)&&(codeL==2)){
-         row=col=0;
-         UnpackWord(word,5,12,row);
-         UnpackWord(word,0,4,col);
-         col=col+32*chip;
-         hitscount++;
-         ftxt<<"DDL:"<<ddlsNumber<<" Mod:"<<moduleID<<" Row:"<<row<<" Col:"<<col<<endl;
-       }//end else if
-      }//end for
-    }//end while
-    f.clear();
-    f.close();
-  }//end for
-  ftxt.close();
-  return;
-}

diff --git a/ITS/AliITSDDLRawData.h b/ITS/AliITSDDLRawData.h
index 6598b15e861941aa7d83b40ee493c1a91fd512ad..64a651fda03d53f9ca73ab3ec8ca21a123a23f42 100644 (file)
--- a/ITS/AliITSDDLRawData.h
+++ b/ITS/AliITSDDLRawData.h
@@ -17,14 +17,12 @@ class AliITSDDLRawData:public TObject{
   virtual ~AliITSDDLRawData(){;}//destructor
   AliITSDDLRawData(const AliITSDDLRawData &source); // copy constructor
   AliITSDDLRawData& operator=(const AliITSDDLRawData &source); // ass. op.
- Int_t RawDataSPD(AliITS *ITS,TTree *TD ,Int_t LDCsNumber,Int_t eventNumber);
+  Int_t RawDataSPD(TBranch* branch);
   // This method generates the files with the Silicon pixel detector data
-  Int_t RawDataSDD(AliITS *ITS,TTree *TD ,Int_t LDCsNumber,Int_t eventNumbe); 
+  Int_t RawDataSDD(TBranch* branch); 
   // This method generates the files with the Silicon drift detector data
-  Int_t RawDataSSD(AliITS *ITS,TTree *TD ,Int_t LDCsNumber,Int_t eventNumbe);
+  Int_t RawDataSSD(TBranch* branch);
   // This method generates the files with the Silicon pixel detector data
-  void  TestFormat(Int_t eventNumber);
-  // A debugging method used to test the files generated for the SPD.
   void SetVerbose(Int_t Verbose){fVerbose=Verbose;}
   // To set the verbose level
  private: 

diff --git a/RAW/AliITSRawStreamSDD.h b/RAW/AliITSRawStreamSDD.h
index c083a71cb89779b54752fcb5461a91b57eb0520d..5ab1f2f223cba82f99937bad0f80b56e30344c3c 100644 (file)
--- a/RAW/AliITSRawStreamSDD.h
+++ b/RAW/AliITSRawStreamSDD.h
@@ -18,6 +18,7 @@ class AliITSRawStreamSDD: public AliITSRawStream {
     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 
 

diff --git a/RAW/AliITSRawStreamSPD.h b/RAW/AliITSRawStreamSPD.h
index 93f121c3c2fe03f8003c7c471c648bb8d0c00922..af4d414ab0ecfbc5dee112f2e8fe5bbb8b917833 100644 (file)
--- a/RAW/AliITSRawStreamSPD.h
+++ b/RAW/AliITSRawStreamSPD.h
@@ -16,6 +16,7 @@ class AliITSRawStreamSPD: public AliITSRawStream {
     Int_t            GetRow() const {return fCoord1;};
     Int_t            GetColumn() const {return fCoord2;};
 
+    enum {kDDLOffset = 0x100};    // offset for DDL numbers
     enum {kDDLsNumber = 20};      // number of DDLs in SPD
     enum {kModulesPerDDL = 12};   // number of modules in each DDL
 

diff --git a/RAW/AliITSRawStreamSSD.h b/RAW/AliITSRawStreamSSD.h
index ae1d0d51f0e71015b23b686198e5d0d4e3ef4a61..5342e13e1f99ddb552bd0afe64f75e8b99014560 100644 (file)
--- a/RAW/AliITSRawStreamSSD.h
+++ b/RAW/AliITSRawStreamSSD.h
@@ -18,6 +18,7 @@ class AliITSRawStreamSSD: public AliITSRawStream {
     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
 

diff --git a/RAW/AliRawDataHeader.h b/RAW/AliRawDataHeader.h
new file mode 100644 (file)
index 0000000..82805ed
--- /dev/null
+++ b/RAW/AliRawDataHeader.h
@@ -0,0 +1,54 @@
+#ifndef ALIRAWDATAHEADER_H
+#define ALIRAWDATAHEADER_H
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+
+struct AliRawDataHeader {
+  AliRawDataHeader() :
+    fSize(0xFFFFFFFF), 
+    fEventID1(0),
+    fL1TriggerType(0),
+    fVersion(1),
+    fEventID2(0),
+    fAttributesSubDetectors(0),
+    fStatusMiniEventID(0),
+    fTriggerClassLow(0),
+    fROILowTriggerClassHigh(0),
+    fROIHigh(0)
+  {}
+
+  UChar_t   GetAttributes() const 
+    {return (fAttributesSubDetectors >> 24) & 0xFF;};
+  Bool_t    TestAttribute(Int_t index) const
+    {return (fAttributesSubDetectors >> (24 + index)) & 1;};
+  void      SetAttribute(Int_t index)
+    {fAttributesSubDetectors |= (1 << (24 + index));};
+  void      ResetAttribute(Int_t index)
+    {fAttributesSubDetectors &= (0xFFFFFFFF ^ (1 << (24 + index)));};
+  UInt_t    GetSubDetectors() const
+    {return fAttributesSubDetectors & 0xFFFFFF;};
+
+  UInt_t    GetStatus() const
+    {return (fStatusMiniEventID >> 12) & 0xFFFF;};
+  UInt_t    GetMiniEventID() const
+    {return fStatusMiniEventID & 0x7FF;};
+
+  ULong64_t GetTriggerClasses() const
+    {return ((ULong64_t) (fROILowTriggerClassHigh & 0x1FFFF)) << 32 + fTriggerClassLow;}
+  ULong64_t GetROI() const
+    {return ((ULong64_t) fROIHigh) << 32 + ((fROILowTriggerClassHigh >> 28) & 0xF);}
+
+  UInt_t    fSize;              // size of the raw data in bytes
+  UShort_t  fEventID1;          // bunch crossing number
+  UChar_t   fL1TriggerType;     // level 1 trigger type
+  UChar_t   fVersion;           // version of the data header format
+  UInt_t    fEventID2;          // orbit number
+  UInt_t    fAttributesSubDetectors; // block attributes (bits 24-31) and participating sub detectors
+  UInt_t    fStatusMiniEventID; // status & error bits (bits 12-27) and mini event ID (bits 0-11)
+  UInt_t    fTriggerClassLow;   // low bits of trigger class
+  UInt_t    fROILowTriggerClassHigh; // low bits of ROI data (bits 28-31) and high bits of trigger class (bits 0-17)
+  UInt_t    fROIHigh;           // high bits of ROI data
+};
+
+#endif

diff --git a/RAW/AliTPCBuffer160.cxx b/RAW/AliTPCBuffer160.cxx
index 8d1ff7bb72d16c3bacee736f7036da1fe1385cd9..50439bdb3b51bd6c407d741f24960a7a249ecb6c 100644 (file)
--- a/RAW/AliTPCBuffer160.cxx
+++ b/RAW/AliTPCBuffer160.cxx
@@ -22,6 +22,7 @@
 // Author: D.Favretto
 
 #include "AliTPCBuffer160.h"
+#include "AliRawDataHeader.h"
 #include <TObjArray.h>
 #include <Riostream.h>
 #include <TMath.h>
@@ -35,7 +36,7 @@ AliTPCBuffer160::AliTPCBuffer160(const char* fileName,Int_t flag){
   //if flag = 0 the actual object is used in the read mode
   fFlag=flag;
   fCurrentCell=0;
-  fMiniHeaderPos=0;
+  fDataHeaderPos=0;
   fMaskBackward=0xFF;
   fVerbose=0;
   if (flag){
@@ -57,7 +58,10 @@ AliTPCBuffer160::AliTPCBuffer160(const char* fileName,Int_t flag){
 #else
     f = new fstream(fileName,ios::in);
 #endif
-    if(!f){cout<<"File doesn't exist:"<<fileName<<endl;;exit(-1);}
+    if(!f){
+      Error("AliTPCBuffer160", "File doesn't exist: %s", fileName);
+      return;
+    }
     fShift=0;
     //To get the file dimension (position of the last element in term of bytes)
     f->seekg(0, ios::end);
@@ -69,7 +73,7 @@ AliTPCBuffer160::AliTPCBuffer160(const char* fileName,Int_t flag){
 }
 
 AliTPCBuffer160::AliTPCBuffer160(fstream* file, Int_t size){
-//constructor for reading a file with mini header
+//constructor for reading a file
   fFlag=0;
   f=file;
   fCurrentCell=0;
@@ -77,11 +81,11 @@ AliTPCBuffer160::AliTPCBuffer160(fstream* file, Int_t size){
   fMaskBackward=0xFF;
   fVerbose=0;
 
-  fMiniHeaderPos=f->tellg();
-  f->seekg(fMiniHeaderPos+size);
+  fDataHeaderPos=f->tellg();
+  f->seekg(fDataHeaderPos+size);
   fFilePosition=f->tellg();
   fFileEnd=fFilePosition;
-  f->seekg(fMiniHeaderPos);
+  f->seekg(fDataHeaderPos);
   fCreated = kFALSE;
 }
 
@@ -91,7 +95,7 @@ AliTPCBuffer160::~AliTPCBuffer160(){
     //Flush out the Buffer content at the end only if Buffer wasn't completely filled
     Flush();
     if(fVerbose)
-      cout<<"File Created\n";
+      Info("~AliTPCBuffer160", "File Created");
   }//end if
   if (fCreated) {
     f->close();
@@ -110,7 +114,7 @@ AliTPCBuffer160::AliTPCBuffer160(const AliTPCBuffer160 &source)
   this->fFlag=source.fFlag;
   this->fMaskBackward=source.fMaskBackward;
   this->fFilePosition=source.fFilePosition;
-  this->fMiniHeaderPos=source.fMiniHeaderPos;
+  this->fDataHeaderPos=source.fDataHeaderPos;
   this->fVerbose=source.fVerbose;
   for (Int_t i=0;i<5;i++)this->fBuffer[i]=source.fBuffer[i];
   return;
@@ -125,7 +129,7 @@ AliTPCBuffer160& AliTPCBuffer160::operator=(const AliTPCBuffer160 &source){
   this->fFlag=source.fFlag;
   this->fMaskBackward=source.fMaskBackward;
   this->fFilePosition=source.fFilePosition;
-  this->fMiniHeaderPos=source.fMiniHeaderPos;
+  this->fDataHeaderPos=source.fDataHeaderPos;
   this->fVerbose=source.fVerbose;
   for (Int_t i=0;i<5;i++)this->fBuffer[i]=source.fBuffer[i];
   return *this;
@@ -182,7 +186,7 @@ Int_t AliTPCBuffer160::GetNextBackWord(){
   UInt_t temp;
   UInt_t value;
   if (!fShift){
-    if (fFilePosition>fMiniHeaderPos){
+    if (fFilePosition>fDataHeaderPos){
       fFilePosition-=sizeof(UInt_t)*5;
       f->seekg(fFilePosition);
       f->read((char*)fBuffer,sizeof(UInt_t)*5);
@@ -212,7 +216,7 @@ Int_t AliTPCBuffer160::GetNextBackWord(){
     }
     else {
 //      f->seekg(fFileEnd);
-      f->seekg(fMiniHeaderPos);
+      f->seekg(fDataHeaderPos);
       return -1;
     }
   }//end if
@@ -319,38 +323,24 @@ Int_t AliTPCBuffer160::ReadTrailerBackward(Int_t &WordsNumber,Int_t &PadNumber,I
   return 0;
 } 
 
-void AliTPCBuffer160::WriteMiniHeader(UInt_t Size,Int_t SecNumber,Int_t SubSector,Int_t Detector,Int_t Flag ){
+void AliTPCBuffer160::WriteDataHeader(Bool_t dummy, Bool_t compressed){
   //Size msg errore sector number sub-sector number 0 for TPC 0 for uncompressed
-  Int_t ddlNumber;
-  UInt_t miniHeader[3];
-  Int_t version=1;
-  if(SecNumber<36)
-    ddlNumber=SecNumber*2+SubSector;
-  else
-    ddlNumber=72+(SecNumber-36)*4+SubSector;
-  //  cout<<"DDL number "<<ddlNumber<<endl;
-  for(Int_t i=0;i<3;i++)miniHeader[i]=0;
-  Int_t miniHeaderSize=(sizeof(UInt_t))*3;
-  PackWord(miniHeader[1],Detector,0,7);
-  PackWord(miniHeader[1],0x123456,8,31);
-  PackWord(miniHeader[2],version,0,7);
-  PackWord(miniHeader[2],Flag,8,15);
-  PackWord(miniHeader[2],ddlNumber,16,31);
-  if (!Size){
+  AliRawDataHeader header;
+  if (dummy){
     //if size=0 it means that this mini header is a dummi mini header
-    fMiniHeaderPos=f->tellp();
-    //cout<<" Position of the DUMMY MH:"<<fMiniHeaderPos<<" Size:"<<Size<<endl;
-    miniHeader[0]=Size;
-    f->write((char*)(miniHeader),miniHeaderSize);
+    fDataHeaderPos=f->tellp();
+    //cout<<" Position of the DUMMY DH:"<<fMiniHeaderPos<<" Size:"<<Size<<endl;
+    f->write((char*)(&header),sizeof(header));
   }//end if
   else{
     UInt_t currentFilePos=f->tellp();
-    f->seekp(fMiniHeaderPos);
-    Size=currentFilePos-fMiniHeaderPos-miniHeaderSize;
-    //cout<<"Current Position (Next MH) "<<currentFilePos<<" Position of the MH:"<<fMiniHeaderPos<<" Size:"<<Size<<endl;
-    miniHeader[0]=Size;
-    //cout<<"Mini Header Size:"<<miniHeader[0]<<endl;
-    f->write((char*)(miniHeader),miniHeaderSize);
+    f->seekp(fDataHeaderPos);
+    header.fSize=currentFilePos-fDataHeaderPos;
+    header.SetAttribute(0);  // valid data
+    if (compressed) header.SetAttribute(1); 
+    //cout<<"Current Position (Next DH) "<<currentFilePos<<" Position of the DH:"<<fDataHeaderPos<<" Size:"<<Size<<endl;
+    //cout<<"Data Header Size:"<<header.fSize<<endl;
+    f->write((char*)(&header),sizeof(header));
     f->seekp(currentFilePos);
   }
   return;
@@ -368,8 +358,8 @@ void AliTPCBuffer160::PackWord(UInt_t &BaseWord, UInt_t Word, Int_t StartBit, In
   length=StopBit-StartBit+1;
   sum=(UInt_t)TMath::Power(2,length)-1;
   if(Word > sum){
-    cout<<"WARNING::Word to be filled is not within desired length"<<endl;
-    exit(-1);
+    Error("PackWord", "Word to be filled is not within desired length");
+    return;
   }
   offSet=sum;
   offSet<<=StartBit;

diff --git a/RAW/AliTPCBuffer160.h b/RAW/AliTPCBuffer160.h
index ba5dbe6fc4bef88a7c26c1a38abfc72f99a19841..0b17c6a44cb2dedd5a1a6b415815fdee67a25d59 100644 (file)
--- a/RAW/AliTPCBuffer160.h
+++ b/RAW/AliTPCBuffer160.h
@@ -29,7 +29,7 @@ class AliTPCBuffer160:public TObject{
 public:
   AliTPCBuffer160(){}//default constructor
   AliTPCBuffer160(const char* fileName,Int_t flag);//constructor
-  AliTPCBuffer160(fstream* file, Int_t size);//constructor for reading a file with mini header
+  AliTPCBuffer160(fstream* file, Int_t size);//constructor for reading a file
   virtual ~AliTPCBuffer160();//destructor
   AliTPCBuffer160(const AliTPCBuffer160 &source); // copy constructor
   AliTPCBuffer160& operator=(const AliTPCBuffer160 &source); // ass. op.
@@ -47,8 +47,8 @@ public:
   //this method is used to read the trailer when the file is read forward
   Int_t ReadTrailerBackward(Int_t &WordsNumber,Int_t &PadNumber,Int_t &RowNumber,Int_t &SecNumber);
   //this method is used to read the trailer when the file is read backward
-  void  WriteMiniHeader(UInt_t Size,Int_t SecNumber,Int_t SubSector,Int_t Detector,Int_t Flag );
-  //this method is used to write the Mini header
+  void  WriteDataHeader(Bool_t dummy, Bool_t comressed);
+  //this method is used to write the data header
   void  SetVerbose(Int_t val){fVerbose=val;}
   //this method is used to set the verbose level 
   //level  0 no output messages
@@ -78,7 +78,7 @@ private:
   Int_t fMaskBackward;  //bit mask for backward reading of a file
   UInt_t fFilePosition;//'pointer' to the actual position in the file
   UInt_t fFileEnd;     //position of the last element of the file (File dimension)
-  UInt_t fMiniHeaderPos;//Mini header position
+  UInt_t fDataHeaderPos;//Data header position
   Int_t  fEndingFillWords;//Few words at the end of the stream
   ClassDef(AliTPCBuffer160,1)
 };

diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx
index 3d574158c10a79ac2c109a44a83be3794b3f9cd8..9937e755f543e9f5b833f159a1f2b80ecde8e663 100644 (file)
--- a/STEER/AliModule.cxx
+++ b/STEER/AliModule.cxx
@@ -48,6 +48,7 @@
 #include "AliRun.h"
 #include "AliTrackReference.h"
 #include "AliMC.h"
+#include "../RAW/AliRawDataHeader.h"
 
 ClassImp(AliModule)
  
@@ -826,3 +827,52 @@ TTree* AliModule::TreeTR()
   TTree* tree = fRunLoader->TreeTR();
   return tree;
 }
+
+
+//_____________________________________________________________________________
+void AliModule::Digits2Raw()
+{
+// This is a dummy version that just copies the digits file contents
+// to a raw data file.
+
+  Warning("Digits2Raw", "Dummy version called for %s", GetName());
+
+  const Int_t kNDetectors = 16;
+  const char* kDetectors[kNDetectors] = {"TPC", "ITSSPD", "ITSSDD", "ITSSSD", "TRD", "TOF", "PHOS", "RICH", "EMCAL", "MUON", "FMD", "ZDC", "PMD", "START", "VZERO", "CRT"};
+  const Int_t kDetectorDDLs[kNDetectors] = {216, 20, 12, 16, 18, 5, 1, 5, 1, 7, 1, 1, 3, 1, 1};
+  Int_t nDDLs = 1;
+  Int_t ddlOffset = 0;
+  for (Int_t i = 0; i < kNDetectors; i++) {
+    if (strcmp(GetName(), kDetectors[i]) == 0) {
+      nDDLs = kDetectorDDLs[i];
+      ddlOffset = 0x100 * i;
+    }
+  }
+
+  if (!GetLoader()) return;
+  fstream digitsFile(GetLoader()->GetDigitsFileName(), ios::in);
+  if (!digitsFile) return;
+
+  digitsFile.seekg(0, ios::end);
+  UInt_t size = digitsFile.tellg();
+  UInt_t ddlSize = size/nDDLs;
+  Char_t* buffer = new Char_t[ddlSize+1];
+
+  for (Int_t iDDL = 0; iDDL < nDDLs; iDDL++) {
+    char fileName[20];
+    sprintf(fileName, "%s_%d.ddl", GetName(), iDDL + ddlOffset);
+    fstream rawFile(fileName, ios::out);
+    if (!rawFile) return;
+
+    AliRawDataHeader header;
+    header.fSize = ddlSize + sizeof(header);
+    rawFile.write((char*) &header, sizeof(header));
+
+    digitsFile.read(buffer, ddlSize);
+    rawFile.write(buffer, ddlSize);
+    rawFile.close();
+  }
+
+  digitsFile.close();
+  delete[] buffer;
+}

diff --git a/STEER/AliModule.h b/STEER/AliModule.h
index 20d1609b6fba94abb379df41dea19e8e9c2c1b92..1f36e59fc4ba5e3a87c944db67b1fba0d6e4fd47 100644 (file)
--- a/STEER/AliModule.h
+++ b/STEER/AliModule.h
@@ -95,7 +95,7 @@ public:
   virtual AliVertexer* CreateVertexer() const {return NULL;}
   virtual AliTracker* CreateTracker() const {return NULL;}
   virtual void        FillESD(AliESD* /*esd*/) const {}
-  virtual void        Digits2Raw() {}
+  virtual void        Digits2Raw();
   virtual void        Raw2Digits() {}
   virtual void        Browse(TBrowser *) {}
   virtual void        CreateGeometry() {}

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 002fadce34c4b7b69bc57d7858bbd33b0e79248c..9813e6f3b856c73c5f6d86ef894789f5be19046b 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -72,9 +72,13 @@
 // than two event streams. It is assumed that the sdigits were already       //
 // produced for the background events.                                       //
 //                                                                           //
-// The methods RunSimulation, RunSDigitization, RunDigitization and          //
-// RunHitsDigitization can be used to run only parts of the full simulation  //
-// chain.                                                                    //
+// The output of raw data can be switched on by calling                      //
+//                                                                           //
+//   sim.SetWriteRawData("MUON");   // write raw data for MUON               //
+//                                                                           //
+// The methods RunSimulation, RunSDigitization, RunDigitization,             //
+// RunHitsDigitization and WriteRawData can be used to run only parts of     //
+// the full simulation chain.                                                //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -88,6 +92,7 @@
 #include "AliRunDigitizer.h"
 #include "AliDigitizer.h"
 #include <TObjString.h>
+#include <TSystem.h>
 
 
 ClassImp(AliSimulation)
@@ -103,6 +108,7 @@ AliSimulation::AliSimulation(const char* configFileName,
   fMakeSDigits("ALL"),
   fMakeDigits("ALL"),
   fMakeDigitsFromHits(""),
+  fWriteRawData(""),
   fStopOnError(kFALSE),
 
   fNEvents(1),
@@ -114,6 +120,7 @@ AliSimulation::AliSimulation(const char* configFileName,
 {
 // create simulation object with default parameters
 
+  SetGAliceFile("galice.root");
 }
 
 //_____________________________________________________________________________
@@ -125,6 +132,7 @@ AliSimulation::AliSimulation(const AliSimulation& sim) :
   fMakeSDigits(sim.fMakeSDigits),
   fMakeDigits(sim.fMakeDigits),
   fMakeDigitsFromHits(sim.fMakeDigitsFromHits),
+  fWriteRawData(sim.fWriteRawData),
   fStopOnError(sim.fStopOnError),
 
   fNEvents(sim.fNEvents),
@@ -181,6 +189,21 @@ void AliSimulation::SetConfigFile(const char* fileName)
   fConfigFileName = fileName;
 }
 
+//_____________________________________________________________________________
+void AliSimulation::SetGAliceFile(const char* fileName)
+{
+// set the name of the galice file
+// the path is converted to an absolute one if it is relative
+
+  fGAliceFileName = fileName;
+  if (!gSystem->IsAbsoluteFileName(fGAliceFileName)) {
+    char* absFileName = gSystem->ConcatFileName(gSystem->WorkingDirectory(),
+                                               fGAliceFileName);
+    fGAliceFileName = absFileName;
+    delete[] absFileName;
+  }
+}
+
 //_____________________________________________________________________________
 void AliSimulation::MergeWith(const char* fileName, Int_t nSignalPerBkgrd)
 {
@@ -230,6 +253,13 @@ Bool_t AliSimulation::Run(Int_t nEvents)
     }
   }
 
+  // digits -> raw data
+  if (!fWriteRawData.IsNull()) {
+    if (!WriteRawData(fWriteRawData)) {
+      if (fStopOnError) return kFALSE;
+    }
+  }
+
   return kTRUE;
 }
 
@@ -260,7 +290,7 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents)
          "Check your config file: %s", fConfigFileName.Data());
     return kFALSE;
   }
-  fGAliceFileName = runLoader->GetFileName();
+  SetGAliceFile(runLoader->GetFileName());
 
   if (!gAlice->Generator()) {
     Error("RunSimulation", "gAlice has no generator object. "
@@ -440,6 +470,57 @@ Bool_t AliSimulation::RunHitsDigitization(const char* detectors)
   return kTRUE;
 }
 
+//_____________________________________________________________________________
+Bool_t AliSimulation::WriteRawData(const char* detectors)
+{
+// convert the digits to raw data
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  AliRunLoader* runLoader = LoadRun();
+  if (!runLoader) return kFALSE;
+
+  for (Int_t iEvent = 0; iEvent < runLoader->GetNumberOfEvents(); iEvent++) {
+    Info("WriteRawData", "processing event %d", iEvent);
+    runLoader->GetEvent(iEvent);
+    TString baseDir = gSystem->WorkingDirectory();
+    char dirName[256];
+    sprintf(dirName, "raw%d", iEvent);
+    gSystem->MakeDirectory(dirName);
+    if (!gSystem->ChangeDirectory(dirName)) {
+      Error("WriteRawData", "couldn't change to directory %s", dirName);
+      if (fStopOnError) return kFALSE; else continue;
+    }
+
+    TString detStr = detectors;
+    TObjArray* detArray = runLoader->GetAliRun()->Detectors();
+    for (Int_t iDet = 0; iDet < detArray->GetEntriesFast(); iDet++) {
+      AliModule* det = (AliModule*) detArray->At(iDet);
+      if (!det || !det->IsActive()) continue;
+      if (IsSelected(det->GetName(), detStr)) {
+       Info("WriteRawData", "creating raw data from digits for %s", 
+            det->GetName());
+       det->Digits2Raw();
+      }
+    }
+
+    gSystem->ChangeDirectory(baseDir);
+    if ((detStr.CompareTo("ALL") != 0) && !detStr.IsNull()) {
+      Error("WriteRawData", "the following detectors were not found: %s", 
+           detStr.Data());
+      if (fStopOnError) return kFALSE;
+    }
+  }
+
+  delete runLoader;
+
+  Info("WriteRawData", "execution time:");
+  stopwatch.Print();
+
+  return kTRUE;
+}
+
 
 //_____________________________________________________________________________
 AliRunLoader* AliSimulation::LoadRun() const

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index 2a32670b5f079808de7d64bae1e2cd70a850dec5..f125fcb3151e9b1ece9caedf97e6ad497204b5ae 100644 (file)
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -22,6 +22,7 @@ public:
 
   void           SetNumberOfEvents(Int_t nEvents);
   void           SetConfigFile(const char* fileName);
+  void           SetGAliceFile(const char* fileName);
 
   void           SetRunGeneration(Bool_t run) {fRunGeneration = run;};
   void           SetRunSimulation(Bool_t run) {fRunSimulation = run;};
@@ -35,6 +36,8 @@ public:
                    {fMakeDigits = detectors;};
   void           SetMakeDigitsFromHits(const char* detectors)
                    {fMakeDigitsFromHits = detectors;};
+  void           SetWriteRawData(const char* detectors)
+                   {fWriteRawData = detectors;};
 
   virtual Bool_t Run(Int_t nEvents = 0);
 
@@ -43,6 +46,7 @@ public:
   virtual Bool_t RunDigitization(const char* detectors = "ALL",
                                 const char* excludeDetectors = "");
   virtual Bool_t RunHitsDigitization(const char* detectors = "ALL");
+  virtual Bool_t WriteRawData(const char* detectors = "ALL");
 
 private:
   AliRunLoader*  LoadRun() const;
@@ -54,6 +58,7 @@ private:
   TString        fMakeSDigits;        // create sdigits for these detectors
   TString        fMakeDigits;         // create digits for these detectors
   TString        fMakeDigitsFromHits; // create digits from hits for these detectors
+  TString        fWriteRawData;       // write raw data for these detectors
   Bool_t         fStopOnError;        // stop or continue on errors
 
   Int_t          fNEvents;            // number of events

diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx
index bda9cdd77f0ebc7ca4c7a0c66eeab31f09f74bb1..0639da3eda06e45107a76e3cbaf6e8a5c316b1b1 100644 (file)
--- a/TPC/AliTPC.cxx
+++ b/TPC/AliTPC.cxx
@@ -78,6 +78,8 @@
 #include "AliTrackReference.h"
 #include "AliMC.h"
 #include "AliTPCDigitizer.h"
+#include "AliTPCBuffer.h"
+#include "AliTPCDDLRawData.h"
 #include "AliTPCclustererMI.h"
 #include "AliTPCtrackerMI.h"
 #include "AliTPCpidESD.h"
@@ -858,6 +860,107 @@ void AliTPC::Digits2Clusters(Int_t /*eventnumber*/) const
   "Dummy function !  Call AliTPCclusterer::Digits2Clusters(...) instead !");
 }
 
+
+//_____________________________________________________________________________
+void AliTPC::Digits2Raw()
+{
+// convert digits of the current event to raw data
+
+  static const Int_t kThreshold = 0;
+  static const Bool_t kCompress = kTRUE;
+
+  fLoader->LoadDigits();
+  TTree* digits = fLoader->TreeD();
+  if (!digits) {
+    Error("Digits2Raw", "no digits tree");
+    return;
+  }
+
+  AliSimDigits digarr;
+  AliSimDigits* digrow = &digarr;
+  digits->GetBranch("Segment")->SetAddress(&digrow);
+
+  const char* fileName = "AliTPCDDL.dat";
+  AliTPCBuffer* buffer  = new AliTPCBuffer(fileName);
+  //Verbose level
+  // 0: Silent
+  // 1: cout messages
+  // 2: txt files with digits 
+  //BE CAREFUL, verbose level 2 MUST be used only for debugging and
+  //it is highly suggested to use this mode only for debugging digits files
+  //reasonably small, because otherwise the size of the txt files can reach
+  //quickly several MB wasting time and disk space.
+  buffer->SetVerbose(0);
+
+  Int_t nEntries = Int_t(digits->GetEntries());
+  Int_t previousSector = -1;
+  Int_t subSector = 0;
+  for (Int_t i = 0; i < nEntries; i++) {
+    digits->GetEntry(i);
+    Int_t sector, row;
+    fTPCParam->AdjustSectorRow(digarr.GetID(), sector, row);
+    if(previousSector != sector) {
+      subSector = 0;
+      previousSector = sector;
+    }
+
+    if (sector < 36) { //inner sector [0;35]
+      if (row != 30) {
+       //the whole row is written into the output file
+       buffer->WriteRowBinary(kThreshold, digrow, 0, 0, 0, 
+                              sector, subSector, row);
+      } else {
+       //only the pads in the range [37;48] are written into the output file
+       buffer->WriteRowBinary(kThreshold, digrow, 37, 48, 1, 
+                              sector, subSector, row);
+       subSector = 1;
+       //only the pads outside the range [37;48] are written into the output file
+       buffer->WriteRowBinary(kThreshold, digrow, 37, 48, 2, 
+                              sector, subSector, row);
+      }//end else
+
+    } else { //outer sector [36;71]
+      if (row == 54) subSector = 2;
+      if ((row != 27) && (row != 76)) {
+       buffer->WriteRowBinary(kThreshold, digrow, 0, 0, 0,
+                              sector, subSector, row);
+      } else if (row == 27) {
+         //only the pads outside the range [43;46] are written into the output file
+         buffer->WriteRowBinary(kThreshold, digrow, 43, 46, 2,
+                                sector, subSector, row);
+         subSector = 1;
+         //only the pads in the range [43;46] are written into the output file
+         buffer->WriteRowBinary(kThreshold, digrow, 43, 46, 1,
+                                sector, subSector, row);
+      } else if (row == 76) {
+         //only the pads outside the range [33;88] are written into the output file
+         buffer->WriteRowBinary(kThreshold, digrow, 33, 88, 2,
+                                sector, subSector, row);
+         subSector = 3;
+         //only the pads in the range [33;88] are written into the output file
+         buffer->WriteRowBinary(kThreshold, digrow, 33, 88, 1,
+                                sector, subSector, row);
+      }
+    }//end else
+  }//end for
+
+  delete buffer;
+  fLoader->UnloadDigits();
+
+  AliTPCDDLRawData rawWriter;
+  rawWriter.SetVerbose(0);
+
+  rawWriter.RawData(fileName);
+  gSystem->Unlink(fileName);
+
+  if (kCompress) {
+    Info("Digits2Raw", "compressing raw data");
+    rawWriter.RawDataCompDecompress(kTRUE);
+    gSystem->Unlink("Statistics");
+  }
+}
+
+
 extern Double_t SigmaY2(Double_t, Double_t, Double_t);
 extern Double_t SigmaZ2(Double_t, Double_t);
 //_____________________________________________________________________________

diff --git a/TPC/AliTPC.h b/TPC/AliTPC.h
index a3ffeaf983abce084b136ad928d18ece5f74c761..e646fd183268edc4f7f609fe9a007547de68ae91 100644 (file)
--- a/TPC/AliTPC.h
+++ b/TPC/AliTPC.h
@@ -66,6 +66,8 @@ public:
   virtual void  Digits2Clusters(Int_t eventnumber=0) const;
   virtual void  Clusters2Tracks() const;
 
+  virtual void  Digits2Raw();
+
   Int_t         GetNsectors() const  {return fNsectors;}
   virtual void  MakeBranch(Option_t *opt=" ");
   virtual void  ResetDigits();

diff --git a/TPC/AliTPCBuffer.cxx b/TPC/AliTPCBuffer.cxx
index 99b499382d3496633f54ec62c512b376143b024d..247c9d0a410a9469efe1caa80e2bf43e2a1b0877 100644 (file)
--- a/TPC/AliTPCBuffer.cxx
+++ b/TPC/AliTPCBuffer.cxx
@@ -30,12 +30,12 @@
 
 ClassImp(AliTPCBuffer)
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-AliTPCBuffer::AliTPCBuffer(const char* /*fileName*/){
+AliTPCBuffer::AliTPCBuffer(const char* fileName){
   // Constructor
 #ifndef __DECCXX
-  f.open("AliTPCDDL.dat",ios::binary|ios::out);
+  f.open(fileName,ios::binary|ios::out);
 #else
-  f.open("AliTPCDDL.dat",ios::out);
+  f.open(fileName,ios::out);
 #endif
   // fout=new TFile(fileName,"recreate");
   // tree=new TTree("tree","Values");

diff --git a/TPC/AliTPCDDLRawData.cxx b/TPC/AliTPCDDLRawData.cxx
index db52c726a4225ad45b019532e98c80d33912d3f4..1b0633478f8540d60330943e4f2cf252c56096df 100644 (file)
--- a/TPC/AliTPCDDLRawData.cxx
+++ b/TPC/AliTPCDDLRawData.cxx
@@ -28,6 +28,7 @@
 #include "AliTPCCompression.h"
 #include "AliTPCBuffer160.h"
 #include "AliTPCDDLRawData.h"
+#include "AliRawDataHeader.h"
 
 ClassImp(AliTPCDDLRawData)
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -48,22 +49,19 @@ AliTPCDDLRawData& AliTPCDDLRawData::operator=(const AliTPCDDLRawData &source){
 
 
 ////////////////////////////////////////////////////////////////////////////
-void AliTPCDDLRawData::RawData(Int_t LDCsNumber,Int_t EventNumber){
-  //Raw data slides generation
+void AliTPCDDLRawData::RawData(const char* inputFileName){
+  //Raw data generation
   //Number of DDL=2*36+4*36=216
   //2 DDL for each inner sector
   //4 DDL for each outer sector
-  Int_t ddlPerFile=216/LDCsNumber;
   Int_t offset=1;
-  if (216%LDCsNumber) ddlPerFile++;
-  cout<<"Number of DDL per slide: "<<ddlPerFile<<endl;
   ifstream f;
 #ifndef __DECCXX
-  f.open("AliTPCDDL.dat",ios::binary);
+  f.open(inputFileName,ios::binary);
 #else
-  f.open("AliTPCDDL.dat");
+  f.open(inputFileName);
 #endif
-  if(!f){cout<<"File doesn't exist !!"<<endl;return;}
+  if(!f){Error("RawData", "File doesn't exist !!");return;}
   struct DataPad{
     Int_t Sec;
     Int_t SubSec;
@@ -74,33 +72,35 @@ void AliTPCDDLRawData::RawData(Int_t LDCsNumber,Int_t EventNumber){
   };
   DataPad data;
 
-  //AliTPCBuffer160 is used in write mode to generate AltroFormat.dat file
-  Int_t sliceNumber=1;
+  //AliTPCBuffer160 is used in write mode to generate raw data file
   char  filename[15];
-  sprintf(filename,"Ev%dTPCslice%d",EventNumber,sliceNumber); 
-  cout<<"   Creating "<<filename<<endl;
-  AliTPCBuffer160 *buffer=new AliTPCBuffer160(filename,1);
-
-  UInt_t count=0;
+  Int_t ddlNumber=0;
+  AliTPCBuffer160 *buffer=NULL;
   Int_t pSecNumber=-1;  //Previous Sector number
   Int_t pRowNumber=-1;  //Previous Row number  
   Int_t pPadNumber=-1;  //Previous Pad number
   Int_t pTimeBin=-1;    //Previous Time-Bin
   Int_t pSubSector=-1;  //Previous Sub Sector
   Int_t bunchLength=0;
-  Int_t countDDL=0;
   Int_t nwords=0;
   UInt_t numPackets=0;
+
   while (f.read((char*)(&data),sizeof(data))){
-    count++;
     if (pPadNumber==-1){
       pSecNumber=data.Sec;
       pRowNumber=data.Row;
       pPadNumber=data.Pad;
       pTimeBin=data.Time;
       pSubSector=data.SubSec;
+
+      if(data.Sec<36)
+       ddlNumber=data.Sec*2+data.SubSec;
+      else
+       ddlNumber=72+(data.Sec-36)*4+data.SubSec;
+      sprintf(filename,"TPC_%d.ddl",ddlNumber+kDDLOffset); 
+      buffer=new AliTPCBuffer160(filename,1);
       //size magic word sector number sub-sector number 0 for TPC 0 for uncompressed
-      buffer->WriteMiniHeader(0,pSecNumber,pSubSector,0,0);//Dummy;
+      buffer->WriteDataHeader(kTRUE,kFALSE);//Dummy;
       bunchLength=1;
       buffer->FillBuffer(data.Dig-offset);
       nwords++;
@@ -123,25 +123,19 @@ void AliTPCDDLRawData::RawData(Int_t LDCsNumber,Int_t EventNumber){
          nwords=0;
 
          if(pSubSector!=data.SubSec){
-           countDDL++;
-           if(countDDL==ddlPerFile){
-             //size magic word sector number sub-sector number 0 for TPC 0 for uncompressed
-             buffer->Flush();
-             buffer->WriteMiniHeader(1,pSecNumber,pSubSector,0,0);
-             //cout<<"Mini header for DDL:"<<PSecNumber<<" Sub-sec:"<<PSubSector<<endl;
-             delete buffer;
-             sliceNumber++;
-             sprintf(filename,"Ev%dTPCslice%d",EventNumber,sliceNumber);
-             cout<<"   Creating "<<filename<<endl;
-             buffer=new AliTPCBuffer160(filename,1);
-             buffer->WriteMiniHeader(0,data.Sec,data.SubSec,0,0);//Dummy;
-             countDDL=0;
-           }//end if
-           else{
-             buffer->Flush();
-             buffer->WriteMiniHeader(1,pSecNumber,pSubSector,0,0);
-             buffer->WriteMiniHeader(0,data.Sec,data.SubSec,0,0);//Dummy;
-           }
+           //size magic word sector number sub-sector number 0 for TPC 0 for uncompressed
+           buffer->Flush();
+           buffer->WriteDataHeader(kFALSE,kFALSE);
+           //cout<<"Data header for DDL:"<<PSecNumber<<" Sub-sec:"<<PSubSector<<endl;
+           delete buffer;
+
+           if(data.Sec<36)
+             ddlNumber=data.Sec*2+data.SubSec;
+           else
+             ddlNumber=72+(data.Sec-36)*4+data.SubSec;
+           sprintf(filename,"TPC_%d.ddl",ddlNumber+kDDLOffset); 
+           buffer=new AliTPCBuffer160(filename,1);
+           buffer->WriteDataHeader(kTRUE,kFALSE);//Dummy;
            pSubSector=data.SubSec;
          }//end if
        }//end if
@@ -156,16 +150,17 @@ void AliTPCDDLRawData::RawData(Int_t LDCsNumber,Int_t EventNumber){
       nwords++;
     }//end else
   }//end while
-  buffer->FillBuffer(pTimeBin);
-  buffer->FillBuffer(bunchLength+2);
-  nwords+=2;
-  buffer->WriteTrailer(nwords,pPadNumber,pRowNumber,pSecNumber);
-  //write the  M.H.
-  buffer->Flush();
-  buffer->WriteMiniHeader(1,pSecNumber,pSubSector,0,0);
-  //cout<<"Mini header for D D L:"<<pSecNumber<<" Sub-sec:"<<pSubSector<<endl;
-  delete buffer;
-  cout<<"Number of digits: "<<count<<endl;
+  if (buffer) {
+    buffer->FillBuffer(pTimeBin);
+    buffer->FillBuffer(bunchLength+2);
+    nwords+=2;
+    buffer->WriteTrailer(nwords,pPadNumber,pRowNumber,pSecNumber);
+    //write the  D.H.
+    buffer->Flush();
+    buffer->WriteDataHeader(kFALSE,kFALSE);
+    //cout<<"Data header for D D L:"<<pSecNumber<<" Sub-sec:"<<pSubSector<<endl;
+    delete buffer;
+  }
   f.close();
   return;
 }
@@ -173,48 +168,44 @@ void AliTPCDDLRawData::RawData(Int_t LDCsNumber,Int_t EventNumber){
 ////////////////////////////////////////////////////////////////////////////
 
 
-Int_t AliTPCDDLRawData::RawDataCompDecompress(Int_t LDCsNumber,Int_t EventNumber,Int_t Comp){
+Int_t AliTPCDDLRawData::RawDataCompDecompress(Bool_t compress){
   //This method is used to compress and decompress the slides
   static const Int_t kNumTables=5;
   char filename[20];
-  char dest[20];
   fstream f;
   UInt_t size=0;
-  //Int_t MagicWord,DDLNumber,SecNumber,SubSector,Detector;
-  Int_t flag=0;
-  for(Int_t i=1;i<=LDCsNumber;i++){
-    if(!Comp){
-      sprintf(filename,"Ev%dTPCslice%d",EventNumber,i);
-      sprintf(dest,"Ev%dTPCslice%d.comp",EventNumber,i);
-    }
-    else{
-      sprintf(filename,"Ev%dTPCslice%d.comp",EventNumber,i);
-      sprintf(dest,"Ev%dTPCslice%d.decomp",EventNumber,i);
-    }
+  AliTPCCompression util;
+  util.SetVerbose(0);
+
+  for(Int_t i=0;i<216;i++){
+    sprintf(filename,"TPC_%d.ddl",i+kDDLOffset);
 #ifndef __DECCXX
     f.open(filename,ios::binary|ios::in);
 #else
     f.open(filename,ios::in);
 #endif
-    if(!f){cout<<"BE CAREFUL!! There isn't enough data to generate "<<LDCsNumber<<" slices"<<endl;break;}
+    if(!f.is_open()){f.clear(); continue;}
     if (fVerbose)
-      cout<<filename<<"  "<<dest<<endl;
+      Info("RawDataCompDecompress", "&s -> dest.ddl", filename);
     ofstream fdest;
 #ifndef __DECCXX
-    fdest.open(dest,ios::binary);
+    fdest.open("dest.ddl",ios::binary);
 #else
-    fdest.open(dest);
+    fdest.open("dest.ddl");
 #endif
     //loop over the DDL block 
-    //Each block contains a Mini Header followed by raw data (ALTRO FORMAT)
+    //Each block contains a Data Header followed by raw data (ALTRO FORMAT)
     //The number of block is ceil(216/LDCsNumber)
-    UInt_t miniHeader[3];
-    //here the Mini Header is read
-    while( (f.read((char*)(miniHeader),sizeof(UInt_t)*3)) ){
-      size=miniHeader[0];
+    AliRawDataHeader header;
+    //here the Data Header is read
+    while( f.read((char*)(&header),sizeof(header)) ){
+      size=header.fSize-sizeof(header);
       // cout<<"Data size:"<<size<<endl;
       //Int_t dim=sizeof(UInt_t)+sizeof(Int_t)*5;
       //cout<<" Sec "<<SecNumber<<" SubSector "<<SubSector<<" size "<<size<<endl;
+      Bool_t compressed = header.TestAttribute(1);
+      if ((compressed && compress) ||
+         (!compressed && !compress)) continue;
       //open the temporay File
       ofstream fo;
       char temp[15]="TempFile";
@@ -230,14 +221,13 @@ Int_t AliTPCDDLRawData::RawDataCompDecompress(Int_t LDCsNumber,Int_t EventNumber
       }//end for
       fo.close();
       //The temp file is compressed or decompressed
-      AliTPCCompression *util = new AliTPCCompression();
-      util->SetVerbose(0);
-      if(!Comp){
-       util->CompressDataOptTables(kNumTables,temp,"TempCompDecomp");
+      Int_t result=0;
+      if(compress){
+       result=util.CompressDataOptTables(kNumTables,temp,"TempCompDecomp");
       }
       else
-       util->DecompressDataOptTables(kNumTables,temp,"TempCompDecomp");
-      delete util;
+       result=util.DecompressDataOptTables(kNumTables,temp,"TempCompDecomp");
+      if (result != 0) break;
       //the temp compressed file is open and copied to the final file fdest
       ifstream fi;
 #ifndef __DECCXX
@@ -248,18 +238,12 @@ Int_t AliTPCDDLRawData::RawDataCompDecompress(Int_t LDCsNumber,Int_t EventNumber
       fi.seekg(0,ios::end);
       size=fi.tellg();
       fi.seekg(0);
-      //The Mini Header is updated (size and Compressed flag) 
+      //The Data Header is updated (size and Compressed flag) 
       //and written into the output file
-      miniHeader[0]=size;
-      if(!Comp)
-       flag=1;
-      else
-       flag=0;
-      UInt_t aux=0x0;
-      flag<<=8;
-      aux|=flag;
-      miniHeader[2]=miniHeader[2]|aux;
-      fdest.write((char*)(miniHeader),sizeof(UInt_t)*3);
+      header.fSize=size+sizeof(header);
+      if (compress) header.SetAttribute(1);
+      else header.ResetAttribute(1);
+      fdest.write((char*)(&header),sizeof(header));
       //The compressem temp file is copied into the output file fdest
       for(UInt_t j=0;j<size;j++){
        fi.read((char*)(&car),1);
@@ -272,22 +256,26 @@ Int_t AliTPCDDLRawData::RawDataCompDecompress(Int_t LDCsNumber,Int_t EventNumber
     fdest.close();
     remove("TempFile");
     remove("TempCompDecomp");
+    rename("dest.ddl",filename);
   }//end for
   return 0;
 }
 
 /////////////////////////////////////////////////////////////////////////////////
-void AliTPCDDLRawData::RawDataAltro()const{
+void AliTPCDDLRawData::RawDataAltro(const char* inputFileName, const char* outputFileName)const{
   //This method is used to build the Altro format from AliTPCDDL.dat
   //It is used to debug the code and creates the tables used in the compresseion phase
   Int_t offset=1;
   ifstream f;
 #ifndef __DECCXX
-  f.open("AliTPCDDL.dat",ios::binary);
+  f.open(inputFileName,ios::binary);
 #else
-  f.open("AliTPCDDL.dat");
+  f.open(inputFileName);
 #endif
-  if(!f){cout<<"File doesn't exist !!"<<endl;return;}
+  if(!f){
+    Error("RawDataAltro", "File doesn't exist !!");
+    return;
+  }
   struct DataPad{
     Int_t Sec;
     Int_t SubSec;
@@ -299,9 +287,8 @@ void AliTPCDDLRawData::RawDataAltro()const{
   DataPad data;
 
   //AliTPCBuffer160 is used in write mode to generate AltroFormat.dat file
-  char  filename[30]="AltroFormatDDL.dat";
-  cout<<"   Creating "<<filename<<endl;
-  AliTPCBuffer160 *buffer=new AliTPCBuffer160(filename,1);
+  Info("RawDataAltro", "Creating &s", outputFileName);
+  AliTPCBuffer160 *buffer=new AliTPCBuffer160(outputFileName,1);
 
   UInt_t count=0;
   Int_t pSecNumber=-1;  //Previous Sector number
@@ -355,55 +342,41 @@ void AliTPCDDLRawData::RawDataAltro()const{
   nwords+=2;
   buffer->WriteTrailer(nwords,pPadNumber,pRowNumber,pSecNumber);
   delete buffer;
-  cout<<"Number of digits: "<<count<<endl;
+  Info("RawDataAltro", "Number of digits: %d", count);
   f.close(); 
   return;
 }
 
 /////////////////////////////////////////////////////////////////////////
-void AliTPCDDLRawData::RawDataAltroDecode(Int_t LDCsNumber,Int_t EventNumber,Int_t Comp){
+void AliTPCDDLRawData::RawDataAltroDecode(const char* outputFileName){
   //This method merges the slides in only one file removing at the same 
-  //time all the mini headers. The file so obtained must be Altro format
+  //time all the data headers. The file so obtained must be Altro format
   //complaiant.
   //It is used mainly in the debugging phase 
   char filename[15];
-  char dest[30];
   fstream f;
-  if(!Comp)
-    sprintf(dest,"AltroDDLRecomposed.dat");
-  else
-    sprintf(dest,"AltroDDLRecomposedDec.dat");
   ofstream fdest;
 
 #ifndef __DECCXX
-  fdest.open(dest,ios::binary);
+  fdest.open(outputFileName,ios::binary);
 #else
-  fdest.open(dest);
+  fdest.open(outputFileName);
 #endif
   UInt_t size=0;
-  //Int_t MagicWord,DDLNumber,SecNumber,SubSector,Detector,flag=0;
-  for(Int_t i=1;i<=LDCsNumber;i++){
-    if(!Comp){
-      sprintf(filename,"Ev%dTPCslice%d",EventNumber,i);  
-    }
-    else{
-      sprintf(filename,"Ev%dTPCslice%d.decomp",EventNumber,i);  
-    }
+  AliRawDataHeader header;
+  for(Int_t i=0;i<216;i++){
+    sprintf(filename,"TPC_%d.ddl",i+kDDLOffset);
 #ifndef __DECCXX
     f.open(filename,ios::binary|ios::in);
 #else
     f.open(filename,ios::in);
 #endif
-    if(!f){cout<<"BE CAREFUL!! There isn't enough data to generate "<<LDCsNumber<<" slices"<<endl;break;}
+    if(!f)continue;
     //loop over the DDL block 
-    //Each block contains a Mini Header followed by raw data (ALTRO FORMAT)
-    //The number of block is ceil(216/LDCsNumber)
-    UInt_t miniHeader[3];
-    //here the Mini Header is read
-    //cout<<filename<<endl;
-    while( (f.read((char*)(miniHeader),sizeof(UInt_t)*3)) ){
+    //Each block contains a Data Header followed by raw data (ALTRO FORMAT)
+    while( (f.read((char*)(&header),sizeof(header))) ){
       Int_t car=0;
-      size=miniHeader[0];
+      size=header.fSize-sizeof(header);
       for(UInt_t j=0;j<size;j++){
        f.read((char*)(&car),1);
        fdest.write((char*)(&car),1);

diff --git a/TPC/AliTPCDDLRawData.h b/TPC/AliTPCDDLRawData.h
index ea602e9c5c3765fae5828cc88b52730f68657a70..782de47297fee2d598b87c856b5a90594998cccf 100644 (file)
--- a/TPC/AliTPCDDLRawData.h
+++ b/TPC/AliTPCDDLRawData.h
@@ -15,19 +15,20 @@ class AliTPCDDLRawData:public TObject{
   virtual ~AliTPCDDLRawData(){;}//destructor
   AliTPCDDLRawData(const AliTPCDDLRawData &source); // copy constructor
   AliTPCDDLRawData& operator=(const AliTPCDDLRawData &source); // ass. op.
-  void  RawData(Int_t LDCsNumber,Int_t EventNumber);
+  void  RawData(const char* inputFileName = "AliTPCDDL.dat");
   //This method is used to create the slides (sequence of files)
-  Int_t RawDataCompDecompress(Int_t LDCsNumber,Int_t EventNumber,Int_t Comp=0);
+  Int_t RawDataCompDecompress(Bool_t compress = kTRUE);
   //This method is used to create the compressed slides starting from the uncompressed ones 
   //or it can be used to decompress a sequence of compressed slices
-  void  RawDataAltro()const;
+  void  RawDataAltro(const char* inputFileName = "AliTPCDDL.dat", const char* outputFileName = "AltroFormatDDL.dat")const;
   //This method is used to create the Altro format file from "AliTPCDDL.dat"
-  void RawDataAltroDecode(Int_t LDCsNumber,Int_t EventNumber,Int_t Comp=0);
+  void RawDataAltroDecode(const char* outputFileName);
   //This method is used to construct an Altro format file starting from
   //the slices compressed or uncompressed
   void SetVerbose(Int_t Verbose){fVerbose=Verbose;}
  private:
   Int_t fVerbose;         //Verbose level 0:Silent, 1: cout msg, 2:txt files for debugging
+  enum {kDDLOffset = 0};  //offset for DDL number
   ClassDef(AliTPCDDLRawData,1)
 };