X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HMPID%2FAliHMPIDRawStream.cxx;h=e9d761d56cb4ba2c96902474ffeff3cc9b291025;hb=b757827cd30c71410b419809b12b7dee9210f72d;hp=41cecc1c94ca71fc73c7fc0059d800ace3f7fde7;hpb=9a6eb595ef66e286da24971e4bb6be27dd599d1f;p=u%2Fmrichter%2FAliRoot.git diff --git a/HMPID/AliHMPIDRawStream.cxx b/HMPID/AliHMPIDRawStream.cxx index 41cecc1c94c..e9d761d56cb 100644 --- a/HMPID/AliHMPIDRawStream.cxx +++ b/HMPID/AliHMPIDRawStream.cxx @@ -181,7 +181,15 @@ Bool_t AliHMPIDRawStream::Next() do { if (!fRawReader->ReadNextData(fData)) return kFALSE; } while (fRawReader->GetDataSize() == 0); + + Int_t runNumber = fRawReader->GetRunNumber(); + + Int_t ddlArray[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13}; + + // next line: fix for link chamber2 cables inversion for period LHC11d, LHC11e, LHC11f and LHC11h. + if(runNumber>=156620 && runNumber<=170593) {ddlArray[4] = 5; ddlArray[5] = 4;} + else {ddlArray[4] = 4; ddlArray[5] = 5;} /* Event type is selected as in $ALICE_ROOT/RAW/event.h @@ -205,7 +213,15 @@ Bool_t AliHMPIDRawStream::Next() fPosition = 0; Bool_t status=kFALSE; fRawDataSize=0; - fDDLNumber = fRawReader->GetDDLID(); + fDDLNumber = -1; + if (fRawReader->GetDDLID()>=0) + fDDLNumber = ddlArray[fRawReader->GetDDLID()]; + + if(fDDLNumber<0) { + AliWarning(Form("fDDLNumber not a acceptable value %i",fDDLNumber)); + return kFALSE; + } + if(fRawReader->GetType() == 7 || fRawReader->GetType() == 8 ) { //New: Select Physics events, Old: Raw data size is not 0 and not 47148 (pedestal) fnDDLInStream[fDDLNumber]=1; fnDDLOutStream[fDDLNumber]=0;