Correct treatment of tracks with pT<pTmin

[u/mrichter/AliRoot.git] / ITS / AliITSRawStreamSSD.cxx

diff --git a/ITS/AliITSRawStreamSSD.cxx b/ITS/AliITSRawStreamSSD.cxx
index bc4a66beffaefb9b4ed5784a8e587ea0dfcd2c69..6160871c7a00a94f557595c050962d97af82616a 100644 (file)
--- a/ITS/AliITSRawStreamSSD.cxx
+++ b/ITS/AliITSRawStreamSSD.cxx
@@ -214,12 +214,12 @@ AliITSRawStreamSSD::AliITSRawStreamSSD(AliRawReader* rawReader) :
   v = gGeoManager->GetVolume("ITSssdSensitivL5");
   if(!v) {
     // new geometry AliITSvPPRasymmFMD
-    AliInfo(Form("Enabling the SSD DDL mapping for the AliITSvPPRasymmFMD"));
+    AliDebugClass(1,"Enabling the SSD DDL mapping for the AliITSvPPRasymmFMD");
     SetvPPRasymmFMDDDLMapping();
   }
   else {
     // new geometry AliITSv11Hybrid
-    AliInfo(Form("Enabling the SSD DDL mapping for the AliITSv11Hybrid"));
+    AliDebugClass(1,"Enabling the SSD DDL mapping for the AliITSv11Hybrid");
     Setv11HybridDDLMapping();
   }
   //  fRawReader->Reset();
@@ -246,12 +246,12 @@ Bool_t AliITSRawStreamSSD::InitDDLModuleMap()
   v = gGeoManager->GetVolume("ITSssdSensitivL5");
   if(!v) {
     // new geometry AliITSvPPRasymmFMD
-    AliInfoClass(Form("Enabling the SSD DDL mapping for the AliITSvPPRasymmFMD"));
+    AliDebugClass(1,"Enabling the SSD DDL mapping for the AliITSvPPRasymmFMD");
     SetvPPRasymmFMDDDLMapping();
   }
   else {
     // new geometry AliITSv11Hybrid
-    AliInfoClass(Form("Enabling the SSD DDL mapping for the AliITSv11Hybrid"));
+    AliDebugClass(1,"Enabling the SSD DDL mapping for the AliITSv11Hybrid");
     Setv11HybridDDLMapping();
   }
   fgkDDLModuleMapInit = kTRUE;
@@ -287,28 +287,28 @@ void AliITSRawStreamSSD::Setv11HybridDDLMapping() {
 {643,642,633,632,635,634,637,636,639,638,641,640,665,664,655,654,657,656,659,658,661,660,663,662,687,686,677,676,679,678,681,680,683,682,685,684,1399,1398,1401,1400,1403,1402,1405,1404,1407,1406,1409,1408,1424,1423,1426,1425,1428,1427,1430,1429,1432,1431,1434,1433,1474,1473,1476,1475,1478,1477,1480,1479,1482,1481,1484,1483,709,708,699,698,701,700,703,702,705,704,707,706,1449,1448,1451,1450,1453,1452,1455,1454,1457,1456,1459,1458,1499,1498,1501,1500,1503,1502,1505,1504,1507,1506,1509,1508},
 
 // ddl8
-{1560,-1,762,763,761,760,758,759,756,757,754,755,1635,-1,784,785,783,782,780,781,778,779,776,777,1610,-1,806,807,805,804,802,803,800,801,798,799,1571,1572,1569,1570,1567,1568,1565,1566,1563,1564,1561,1562,1621,1622,1619,1620,1617,1618,1615,1616,1613,1614,1611,1612,1646,1647,1644,1645,1642,1643,1640,1641,1638,1639,1636,1637,1535,1585,740,741,739,738,736,737,734,735,732,733,1546,1547,1544,1545,1542,1543,1540,1541,1538,1539,1536,1537,1596,1597,1594,1595,1592,1593,1590,1591,1588,1589,1586,1587},
+{1560,-1,762,763,760,761,758,759,756,757,754,755,1635,-1,784,785,782,783,780,781,778,779,776,777,1610,-1,806,807,804,805,802,803,800,801,798,799,1571,1572,1569,1570,1567,1568,1565,1566,1563,1564,1561,1562,1621,1622,1619,1620,1617,1618,1615,1616,1613,1614,1611,1612,1646,1647,1644,1645,1642,1643,1640,1641,1638,1639,1636,1637,1535,1585,740,741,738,739,736,737,734,735,732,733,1546,1547,1544,1545,1542,1543,1540,1541,1538,1539,1536,1537,1596,1597,1594,1595,1592,1593,1590,1591,1588,1589,1586,1587},
 
 // ddl9
-{1685,-1,828,829,827,826,824,825,822,823,820,821,1660,-1,850,851,849,848,846,847,844,845,842,843,1735,-1,872,873,871,870,868,869,866,867,864,865,1671,1672,1669,1670,1667,1668,1665,1666,1663,1664,1661,1662,1696,1697,1694,1695,1692,1693,1690,1691,1688,1689,1686,1687,1746,1747,1744,1745,1742,1743,1740,1741,1738,1739,1736,1737,-1,1710,894,895,893,892,890,891,888,889,886,887,-1,-1,916,917,915,914,912,913,910,911,908,909,1721,1722,1719,1720,1717,1718,1715,1716,1713,1714,1711,1712},
+{1685,-1,828,829,826,827,824,825,822,823,820,821,1660,-1,850,851,848,849,846,847,844,845,842,843,1735,-1,872,873,870,871,868,869,866,867,864,865,1671,1672,1669,1670,1667,1668,1665,1666,1663,1664,1661,1662,1696,1697,1694,1695,1692,1693,1690,1691,1688,1689,1686,1687,1746,1747,1744,1745,1742,1743,1740,1741,1738,1739,1736,1737,-1,1710,894,895,892,893,890,891,888,889,886,887,-1,-1,916,917,914,915,912,913,910,911,908,909,1721,1722,1719,1720,1717,1718,1715,1716,1713,1714,1711,1712},
 
 // ddl10
-{1785,-1,960,961,959,958,956,957,954,955,952,953,1860,-1,982,983,981,980,978,979,976,977,974,975,1835,-1,1004,1005,1003,1002,1000,1001,998,999,996,997,1796,1797,1794,1795,1792,1793,1790,1791,1788,1789,1786,1787,1846,1847,1844,1845,1842,1843,1840,1841,1838,1839,1836,1837,1871,1872,1869,1870,1867,1868,1865,1866,1863,1864,1861,1862,1760,1810,938,939,937,936,934,935,932,933,930,931,1771,1772,1769,1770,1767,1768,1765,1766,1763,1764,1761,1762,1821,1822,1819,1820,1817,1818,1815,1816,1813,1814,1811,1812},
+{1785,-1,960,961,958,959,956,957,954,955,952,953,1860,-1,982,983,980,981,978,979,976,977,974,975,1835,-1,1004,1005,1002,1003,1000,1001,998,999,996,997,1796,1797,1794,1795,1792,1793,1790,1791,1788,1789,1786,1787,1846,1847,1844,1845,1842,1843,1840,1841,1838,1839,1836,1837,1871,1872,1869,1870,1867,1868,1865,1866,1863,1864,1861,1862,1760,1810,938,939,936,937,934,935,932,933,930,931,1771,1772,1769,1770,1767,1768,1765,1766,1763,1764,1761,1762,1821,1822,1819,1820,1817,1818,1815,1816,1813,1814,1811,1812},
 
 // ddl11
-{1910,-1,1026,1027,1025,1024,1022,1023,1020,1021,1018,1019,1885,-1,1048,1049,1047,1046,1044,1045,1042,1043,1040,1041,1960,-1,1070,1071,1069,1068,1066,1067,1064,1065,1062,1063,1896,1897,1894,1895,1892,1893,1890,1891,1888,1889,1886,1887,1921,1922,1919,1920,1917,1918,1915,1916,1913,1914,1911,1912,1971,1972,1969,1970,1967,1968,1965,1966,1963,1964,1961,1962,1985,1935,1092,1093,1091,1090,1088,1089,1086,1087,1084,1085,1946,1947,1944,1945,1942,1943,1940,1941,1938,1939,1936,1937,1996,1997,1994,1995,1992,1993,1990,1991,1988,1989,1986,1987},
+{1910,-1,1026,1027,1024,1025,1022,1023,1020,1021,1018,1019,1885,-1,1048,1049,1046,1047,1044,1045,1042,1043,1040,1041,1960,-1,1070,1071,1068,1069,1066,1067,1064,1065,1062,1063,1896,1897,1894,1895,1892,1893,1890,1891,1888,1889,1886,1887,1921,1922,1919,1920,1917,1918,1915,1916,1913,1914,1911,1912,1971,1972,1969,1970,1967,1968,1965,1966,1963,1964,1961,1962,1985,1935,1092,1093,1090,1091,1088,1089,1086,1087,1084,1085,1946,1947,1944,1945,1942,1943,1940,1941,1938,1939,1936,1937,1996,1997,1994,1995,1992,1993,1990,1991,1988,1989,1986,1987},
 
 // ddl12
-{2035,-1,1136,1137,1135,1134,1132,1133,1130,1131,1128,1129,2110,-1,1158,1159,1157,1156,1154,1155,1152,1153,1150,1151,2085,-1,1180,1181,1179,1178,1176,1177,1174,1175,1172,1173,2046,2047,2044,2045,2042,2043,2040,2041,2038,2039,2036,2037,2096,2097,2094,2095,2092,2093,2090,2091,2088,2089,2086,2087,2121,2122,2119,2120,2117,2118,2115,2116,2113,2114,2111,2112,2010,2060,1114,1115,1113,1112,1110,1111,1108,1109,1106,1107,2021,2022,2019,2020,2017,2018,2015,2016,2013,2014,2011,2012,2071,2072,2069,2070,2067,2068,2065,2066,2063,2064,2061,2062},
+{2035,-1,1136,1137,1134,1135,1132,1133,1130,1131,1128,1129,2110,-1,1158,1159,1156,1157,1154,1155,1152,1153,1150,1151,2085,-1,1180,1181,1178,1179,1176,1177,1174,1175,1172,1173,2046,2047,2044,2045,2042,2043,2040,2041,2038,2039,2036,2037,2096,2097,2094,2095,2092,2093,2090,2091,2088,2089,2086,2087,2121,2122,2119,2120,2117,2118,2115,2116,2113,2114,2111,2112,2010,2060,1114,1115,1112,1113,1110,1111,1108,1109,1106,1107,2021,2022,2019,2020,2017,2018,2015,2016,2013,2014,2011,2012,2071,2072,2069,2070,2067,2068,2065,2066,2063,2064,2061,2062},
 
 // ddl13
-{2160,-1,1202,1203,1201,1200,1198,1199,1196,1197,1194,1195,2135,-1,1224,1225,1223,1222,1220,1221,1218,1219,1216,1217,1260,-1,1246,1247,1245,1244,1242,1243,1240,1241,1238,1239,1271,1272,1269,1270,1267,1268,1265,1266,1263,1264,1261,1262,2146,2147,2144,2145,2142,2143,2140,2141,2138,2139,2136,2137,2171,2172,2169,2170,2167,2168,2165,2166,2163,2164,2161,2162,-1,2185,520,521,519,518,516,517,514,515,512,513,-1,-1,542,543,541,540,538,539,536,537,534,535,2196,2197,2194,2195,2192,2193,2190,2191,2188,2189,2186,2187},
+{2160,-1,1202,1203,1200,1201,1198,1199,1196,1197,1194,1195,2135,-1,1224,1225,1222,1223,1220,1221,1218,1219,1216,1217,1260,-1,1246,1247,1244,1245,1242,1243,1240,1241,1238,1239,1271,1272,1269,1270,1267,1268,1265,1266,1263,1264,1261,1262,2146,2147,2144,2145,2142,2143,2140,2141,2138,2139,2136,2137,2171,2172,2169,2170,2167,2168,2165,2166,2163,2164,2161,2162,-1,2185,520,521,518,519,516,517,514,515,512,513,-1,-1,542,543,540,541,538,539,536,537,534,535,2196,2197,2194,2195,2192,2193,2190,2191,2188,2189,2186,2187},
 
 // ddl14
-{1310,-1,586,587,585,584,582,583,580,581,578,579,1385,-1,608,609,607,606,604,605,602,603,600,601,1360,-1,630,631,629,628,626,627,624,625,622,623,1321,1322,1319,1320,1317,1318,1315,1316,1313,1314,1311,1312,1371,1372,1369,1370,1367,1368,1365,1366,1363,1364,1361,1362,1396,1397,1394,1395,1392,1393,1390,1391,1388,1389,1386,1387,1285,1335,564,565,563,562,560,561,558,559,556,557,1296,1297,1294,1295,1292,1293,1290,1291,1288,1289,1286,1287,1346,1347,1344,1345,1342,1343,1340,1341,1338,1339,1336,1337},
+{1310,-1,586,587,584,585,582,583,580,581,578,579,1385,-1,608,609,606,607,604,605,602,603,600,601,1360,-1,630,631,628,629,626,627,624,625,622,623,1321,1322,1319,1320,1317,1318,1315,1316,1313,1314,1311,1312,1371,1372,1369,1370,1367,1368,1365,1366,1363,1364,1361,1362,1396,1397,1394,1395,1392,1393,1390,1391,1388,1389,1386,1387,1285,1335,564,565,562,563,560,561,558,559,556,557,1296,1297,1294,1295,1292,1293,1290,1291,1288,1289,1286,1287,1346,1347,1344,1345,1342,1343,1340,1341,1338,1339,1336,1337},
 
 // ddl15
-{1435,-1,652,653,651,650,648,649,646,647,644,645,1410,-1,674,675,673,672,670,671,668,669,666,667,1485,-1,696,697,695,694,692,693,690,691,688,689,1421,1422,1419,1420,1417,1418,1415,1416,1413,1414,1411,1412,1446,1447,1444,1445,1442,1443,1440,1441,1438,1439,1436,1437,1496,1497,1494,1495,1492,1493,1490,1491,1488,1489,1486,1487,1510,1460,718,719,717,716,714,715,712,713,710,711,1471,1472,1469,1470,1467,1468,1465,1466,1463,1464,1461,1462,1521,1522,1519,1520,1517,1518,1515,1516,1513,1514,1511,1512}
+{1435,-1,652,653,650,651,648,649,646,647,644,645,1410,-1,674,675,672,673,670,671,668,669,666,667,1485,-1,696,697,694,695,692,693,690,691,688,689,1421,1422,1419,1420,1417,1418,1415,1416,1413,1414,1411,1412,1446,1447,1444,1445,1442,1443,1440,1441,1438,1439,1436,1437,1496,1497,1494,1495,1492,1493,1490,1491,1488,1489,1486,1487,1510,1460,718,719,716,717,714,715,712,713,710,711,1471,1472,1469,1470,1467,1468,1465,1466,1463,1464,1461,1462,1521,1522,1519,1520,1517,1518,1515,1516,1513,1514,1511,1512}
     
     };
   for(Int_t iddl = 0; iddl < kDDLsNumber; iddl++) {
@@ -528,8 +528,8 @@ Bool_t AliITSRawStreamSSD::Next()
 
 
   flag=1;
-  // relModuleID range 0 - 108
-  if(relModuleID > kModulesPerDDL){
+  // relModuleID range 0 - 107
+  if(relModuleID >= kModulesPerDDL){
     fRawReader->AddMajorErrorLog(kWrongModuleIdErr,Form("Module ID = %d > %d (max)",relModuleID,kModulesPerDDL));
     AliWarning(Form("Module ID = %d > %d (max)",relModuleID,kModulesPerDDL));
     return kFALSE;
@@ -537,8 +537,16 @@ Bool_t AliITSRawStreamSSD::Next()
   flag=0;
 
 
-
-  fModuleID = fgkDDLModuleMap[fRawReader->GetDDLID()][relModuleID];
+  Int_t ddlid=fRawReader->GetDDLID();
+  if(ddlid<0){
+    AliError("fRawReader->GetDDLID returns a negative value");
+    ddlid=0;
+  }
+  if(ddlid>=kDDLsNumber){
+    AliError(Form("fRawReader->GetDDLID returns a too big value %i \n",ddlid));
+    return kFALSE;
+  }
+  fModuleID = fgkDDLModuleMap[ddlid][relModuleID];
       
   fCoord2 =  (fData >> 12) & 0x000007FF; 
   fCoord1 = (fCoord2 < 768) ? 0 : 1; // strip 0 - 767 are Pside, strip 768 - 1535 are Nside