fIsADCEOB(kFALSE),
fSODReading(kFALSE),
fIsMapRead(kFALSE),
+ fReadCDH(kFALSE),
fDeadfaceOffset(-1),
fDeadbeefOffset(-1),
fDataOffset(0),
fCurrentCh(-1),
fCabledSignal(-1),
fCurrScCh(-1),
+ fCurrTDCCh(-1),
fIsADCEventGood(kTRUE),
fIsL0BitSet(kTRUE),
fIsPileUpEvent(kFALSE),
- fIsZDCTDCHeader(kFALSE),
+ fIsADDChannel(kFALSE),
+ fADDADCdatum(0),
fIsTDCHeaderRead(kFALSE),
fTDCStartCounter(0),
- fIsADDChannel(kFALSE),
+ fIsZDCTDCHeader(kFALSE),
+ fIsZDCTDCdatum(kFALSE),
+ fZDCTDCdatum(0),
fIsADDTDCHeader(kFALSE),
- fIsADDTDCdatum(kFALSE)
+ fIsADDTDCdatum(kFALSE),
+ fADDTDCdatum(0)
{
// Create an object to read ZDC raw digits
fRawReader->Reset();
for(Int_t i=0; i<kNch; i++){
for(Int_t j=0; j<5; j++){
fMapADC[i][j]=-1;
- if(i<32) fScalerMap[i][j]=-1;
+ if(i<32){
+ fScalerMap[i][j]=-1;
+ if(j<3) fTDCMap[i][j]=-1;
+ }
}
}
fIsADCEOB(stream.fIsADCEOB),
fSODReading(stream.fSODReading),
fIsMapRead(stream.fIsMapRead),
+ fReadCDH(stream.fReadCDH),
fDeadfaceOffset(stream.GetDeadfaceOffset()),
fDeadbeefOffset(stream.GetDeadbeefOffset()),
fDataOffset(stream.GetDataOffset()),
fCurrentCh(stream.fCurrentCh),
fCabledSignal(stream.GetCabledSignal()),
fCurrScCh(stream.fCurrScCh),
+ fCurrTDCCh(stream.fCurrTDCCh),
fIsADCEventGood(stream.fIsADCEventGood),
fIsL0BitSet(stream.fIsL0BitSet),
fIsPileUpEvent(stream.fIsPileUpEvent),
- fIsZDCTDCHeader(stream.fIsZDCTDCHeader),
+ fIsADDChannel(stream.fIsADDChannel),
+ fADDADCdatum(stream.fADDADCdatum),
fIsTDCHeaderRead(stream.fIsTDCHeaderRead),
fTDCStartCounter(stream.fTDCStartCounter),
- fIsADDChannel(stream.fIsADDChannel),
+ fIsZDCTDCHeader(stream.fIsZDCTDCHeader),
+ fIsZDCTDCdatum(stream.fIsZDCTDCdatum),
+ fZDCTDCdatum(stream.fZDCTDCdatum),
fIsADDTDCHeader(stream.fIsADDTDCHeader),
- fIsADDTDCdatum(stream.fIsADDTDCdatum)
-
+ fIsADDTDCdatum(stream.fIsADDTDCdatum),
+ fADDTDCdatum(stream.fADDTDCdatum)
{
// Copy constructor
const int kNch = 48;
for(Int_t i=0; i<kNch; i++){
fMapADC[i][0] = chMap->GetADCModule(i);
fMapADC[i][1] = chMap->GetADCChannel(i);
- fMapADC[i][2] = -1;
+ fMapADC[i][2] = chMap->GetADCSignalCode(i);
fMapADC[i][3] = chMap->GetDetector(i);
fMapADC[i][4] = chMap->GetSector(i);
}
//printf("\t AliZDCRawStream::ReadCDHHeader -> L1TriggerMessage %x\n",header->GetL1TriggerMessage());
//printf("\t AliZDCRawStream::ReadCDHHeader -> Calibration bit = %d\n",fIsCalib);
- UInt_t status = header->GetStatus();
+/* UInt_t status = header->GetStatus();
//printf("\t AliZDCRawStream::ReadCDHHeader -> status = %d\n",status);
-/* if((status & 0x000f) == 0x0001){
+ if((status & 0x000f) == 0x0001){
AliDebug(2,"CDH -> DARC trg0 overlap error");
fRawReader->AddMajorErrorLog(kDARCError);
}
if(!fRawReader->ReadNextInt((UInt_t&) fBuffer)) return kFALSE;
const int kNch = 48;
- Int_t kFirstADCGeo=0, kLastADCGeo=3;
- Int_t kADDADCGeo=5, kADDTDCGeo=6;
- Int_t kZDCTDCGeo=8, kScalerGeo=16;
- Int_t kPUGeo=29, kTrigScales=30, kTrigHistory=31;
//
fIsHeaderMapping = kFALSE; fIsChMapping = kFALSE;
fIsADCHeader = kFALSE; fIsADCDataWord = kFALSE; fIsADCEOB = kFALSE;
- fIsADDChannel = kFALSE; fIsADDTDCHeader= kFALSE; fIsADDTDCdatum=kFALSE;
+ fIsZDCTDCdatum = kFALSE; fIsADDChannel = kFALSE; fIsADDTDCdatum=kFALSE;
fIsUnderflow = kFALSE; fIsOverflow = kFALSE; fIsScalerWord = kFALSE;
fSector[0] = fSector[1] = -1;
for(Int_t kl=0; kl<4; kl++) fCPTInput[kl] = 0;
fEvType = fRawReader->GetType();
if(fPosition==0){
- //if(fEvType==7 || fEvType ==8){ //Physics or calibration event
- ReadCDHHeader();
- //}
- fCurrentCh=0; fCurrScCh=0; fNChannelsOn=0;
+ ReadCDHHeader();
+ // Needed to read simulated raw data (temporary solution?)
+ if(!fReadCDH) fReadOutCard=1;
+ fCurrentCh=0; fCurrScCh=0; fCurrTDCCh=0;fNChannelsOn=0;
// Ch. debug
//printf("\n AliZDCRawStream::Next() - ev. type %d",fEvType);
}
-
// Ch. debug
//printf("\n AliZDCRawStream::Next() - fBuffer[%d] = %x\n",fPosition, fBuffer);
// DARC 1st datum @ fDataOffset+1 \ ZRC 1st valid datum @ fDataOffset=0
if((fPosition==fDataOffset+1) || (fPosition==fDataOffset)){
printf("\n\n ------ AliZDCRawStream -> Reading mapping from StartOfData event ------\n");
- fCurrentCh=0; fCurrScCh=0;
+ fCurrentCh=0; fCurrScCh=0; fCurrTDCCh=0;
}
else{
printf(" ------ AliZDCRawStream -> End of ZDC StartOfData event ------\n\n");
|| fCabledSignal==24 || fCabledSignal==48){
fMapADC[fCurrentCh][3] = 4; //ZNA
//
- if(fCabledSignal==kZNAC || fCabledSignal==kZNACoot) fMapADC[fCurrentCh][4]=0;
- else if(fCabledSignal==3 || fCabledSignal==27) fMapADC[fCurrentCh][4]=1;
- else if(fCabledSignal==4 || fCabledSignal==28) fMapADC[fCurrentCh][4]=2;
- else if(fCabledSignal==5 || fCabledSignal==29) fMapADC[fCurrentCh][4]=3;
- else if(fCabledSignal==6 || fCabledSignal==30) fMapADC[fCurrentCh][4]=4;
- else if(fCabledSignal==24 || fCabledSignal==48) fMapADC[fCurrentCh][4]=5; //Reference PTM
+ if(fCabledSignal==kZNAC || fCabledSignal==kZNACoot) fMapADC[fCurrentCh][4]=0;
+ else if(fCabledSignal==kZNA1 || fCabledSignal==kZNA1oot) fMapADC[fCurrentCh][4]=1;
+ else if(fCabledSignal==kZNA2 || fCabledSignal==kZNA2oot) fMapADC[fCurrentCh][4]=2;
+ else if(fCabledSignal==kZNA3 || fCabledSignal==kZNA3oot) fMapADC[fCurrentCh][4]=3;
+ else if(fCabledSignal==kZNA4 || fCabledSignal==kZNA4oot) fMapADC[fCurrentCh][4]=4;
+ else if(fCabledSignal==kZDCAMon || fCabledSignal==kZDCAMonoot) fMapADC[fCurrentCh][4]=5; //Reference PTM
}
else if((fCabledSignal>=7 && fCabledSignal<=11) || (fCabledSignal>=31 && fCabledSignal<=35)){
fMapADC[fCurrentCh][3] = 5; //ZPA
//
- if(fCabledSignal==7 || fCabledSignal==31) fMapADC[fCurrentCh][4]=0;
- else if(fCabledSignal==8 || fCabledSignal==32) fMapADC[fCurrentCh][4]=1;
- else if(fCabledSignal==9 || fCabledSignal==33) fMapADC[fCurrentCh][4]=2;
- else if(fCabledSignal==10 || fCabledSignal==34) fMapADC[fCurrentCh][4]=3;
- else if(fCabledSignal==11 || fCabledSignal==35) fMapADC[fCurrentCh][4]=4;
+ if(fCabledSignal==kZPAC || fCabledSignal==kZPACoot) fMapADC[fCurrentCh][4]=0;
+ else if(fCabledSignal==kZPA1 || fCabledSignal==kZPA1oot) fMapADC[fCurrentCh][4]=1;
+ else if(fCabledSignal==kZPA2 || fCabledSignal==kZPA2oot) fMapADC[fCurrentCh][4]=2;
+ else if(fCabledSignal==kZPA3 || fCabledSignal==kZPA3oot) fMapADC[fCurrentCh][4]=3;
+ else if(fCabledSignal==kZPA4 || fCabledSignal==kZPA4oot) fMapADC[fCurrentCh][4]=4;
}
else if((fCabledSignal>=12 && fCabledSignal<=16) || (fCabledSignal>=36 && fCabledSignal<=40)
|| fCabledSignal==25 || fCabledSignal==49){
fMapADC[fCurrentCh][3] = 1; //ZNC
//
- if(fCabledSignal==12 || fCabledSignal==36) fMapADC[fCurrentCh][4]=0;
- else if(fCabledSignal==13 || fCabledSignal==37) fMapADC[fCurrentCh][4]=1;
- else if(fCabledSignal==14 || fCabledSignal==38) fMapADC[fCurrentCh][4]=2;
- else if(fCabledSignal==15 || fCabledSignal==39) fMapADC[fCurrentCh][4]=3;
- else if(fCabledSignal==16 || fCabledSignal==40) fMapADC[fCurrentCh][4]=4;
- else if(fCabledSignal==25 || fCabledSignal==49) fMapADC[fCurrentCh][4]=5; //Reference PTM
+ if(fCabledSignal==kZNCC || fCabledSignal==kZNCCoot) fMapADC[fCurrentCh][4]=0;
+ else if(fCabledSignal==kZNC1 || fCabledSignal==kZNC1oot) fMapADC[fCurrentCh][4]=1;
+ else if(fCabledSignal==kZNC2 || fCabledSignal==kZNC2oot) fMapADC[fCurrentCh][4]=2;
+ else if(fCabledSignal==kZNC3 || fCabledSignal==kZNC3oot) fMapADC[fCurrentCh][4]=3;
+ else if(fCabledSignal==kZNC4 || fCabledSignal==kZNC4oot) fMapADC[fCurrentCh][4]=4;
+ else if(fCabledSignal==kZDCCMon || fCabledSignal==kZDCCMonoot) fMapADC[fCurrentCh][4]=5; //Reference PTM
}
else if((fCabledSignal>=17 && fCabledSignal<=21) || (fCabledSignal>=41 && fCabledSignal<=45)){
fMapADC[fCurrentCh][3] = 2; //ZPC
//
- if(fCabledSignal==17 || fCabledSignal==41) fMapADC[fCurrentCh][4]=0;
- else if(fCabledSignal==18 || fCabledSignal==42) fMapADC[fCurrentCh][4]=1;
- else if(fCabledSignal==19 || fCabledSignal==43) fMapADC[fCurrentCh][4]=2;
- else if(fCabledSignal==20 || fCabledSignal==44) fMapADC[fCurrentCh][4]=3;
- else if(fCabledSignal==21 || fCabledSignal==45) fMapADC[fCurrentCh][4]=4;
+ if(fCabledSignal==kZPCC || fCabledSignal==kZPCCoot) fMapADC[fCurrentCh][4]=0;
+ else if(fCabledSignal==kZPC1 || fCabledSignal==kZPC1oot) fMapADC[fCurrentCh][4]=1;
+ else if(fCabledSignal==kZPC2 || fCabledSignal==kZPC2oot) fMapADC[fCurrentCh][4]=2;
+ else if(fCabledSignal==kZPC3 || fCabledSignal==kZPC3oot) fMapADC[fCurrentCh][4]=3;
+ else if(fCabledSignal==kZPC4 || fCabledSignal==kZPC4oot) fMapADC[fCurrentCh][4]=4;
}
else if(fCabledSignal==22 || fCabledSignal==23 || fCabledSignal==46 || fCabledSignal==47){
fMapADC[fCurrentCh][3] = 3; // ZEM
//
- if(fCabledSignal==22 || fCabledSignal==46) fMapADC[fCurrentCh][4]=1;
- else if(fCabledSignal==23 || fCabledSignal==47) fMapADC[fCurrentCh][4]=2;
+ if(fCabledSignal==kZEM1 || fCabledSignal==kZEM1oot) fMapADC[fCurrentCh][4]=1;
+ else if(fCabledSignal==kZEM2 || fCabledSignal==kZEM2oot) fMapADC[fCurrentCh][4]=2;
}
//Ch. debug
//printf("\tADC mod. %d ch. %d signal %d ",fADCModule,fADCChannel,fCabledSignal);
// look the enum in AliZDCRawStream.h file
// -----------------------------------------
// NOT CONSIDERING OUT OF TIME OR REFERENCE SIGNALS FOR SCALER!!!!!
- if(fCabledSignal>=2 && fCabledSignal<=6 ||
- fCabledSignal>=61 && fCabledSignal<=65){
+ if((fCabledSignal>=2 && fCabledSignal<=6) ||
+ (fCabledSignal>=61 && fCabledSignal<=65)){
fScalerMap[fCurrScCh][3] = 4; //ZNA
//
- if(fCabledSignal==2 || fCabledSignal==61) fScalerMap[fCurrScCh][4]=0;
- else if(fCabledSignal==3 || fCabledSignal==62) fScalerMap[fCurrScCh][4]=1;
- else if(fCabledSignal==4 || fCabledSignal==63) fScalerMap[fCurrScCh][4]=2;
- else if(fCabledSignal==5 || fCabledSignal==64) fScalerMap[fCurrScCh][4]=3;
- else if(fCabledSignal==6 || fCabledSignal==65) fScalerMap[fCurrScCh][4]=4;
+ if(fCabledSignal==kZNAC || fCabledSignal==kZNACD) fScalerMap[fCurrScCh][4]=0;
+ else if(fCabledSignal==kZNA1 || fCabledSignal==kZNA1D) fScalerMap[fCurrScCh][4]=1;
+ else if(fCabledSignal==kZNA2 || fCabledSignal==kZNA2D) fScalerMap[fCurrScCh][4]=2;
+ else if(fCabledSignal==kZNA3 || fCabledSignal==kZNA3D) fScalerMap[fCurrScCh][4]=3;
+ else if(fCabledSignal==kZNA4 || fCabledSignal==kZNA4D) fScalerMap[fCurrScCh][4]=4;
}
- else if(fCabledSignal>=7 && fCabledSignal<=11 ||
- fCabledSignal>=66 && fCabledSignal<=70){
+ else if((fCabledSignal>=7 && fCabledSignal<=11) ||
+ (fCabledSignal>=66 && fCabledSignal<=70)){
fScalerMap[fCurrScCh][3] = 5; //ZPA
//
- if(fCabledSignal==7 || fCabledSignal==66) fScalerMap[fCurrScCh][4]=0;
- else if(fCabledSignal==8 || fCabledSignal==67) fScalerMap[fCurrScCh][4]=1;
- else if(fCabledSignal==9 || fCabledSignal==68) fScalerMap[fCurrScCh][4]=2;
- else if(fCabledSignal==10 || fCabledSignal==69) fScalerMap[fCurrScCh][4]=3;
- else if(fCabledSignal==11 || fCabledSignal==70) fScalerMap[fCurrScCh][4]=4;
+ if(fCabledSignal==kZPAC || fCabledSignal==kZPACD) fScalerMap[fCurrScCh][4]=0;
+ else if(fCabledSignal==kZPA1 || fCabledSignal==kZPA1D) fScalerMap[fCurrScCh][4]=1;
+ else if(fCabledSignal==kZPA2 || fCabledSignal==kZPA2D) fScalerMap[fCurrScCh][4]=2;
+ else if(fCabledSignal==kZPA3 || fCabledSignal==kZPA3D) fScalerMap[fCurrScCh][4]=3;
+ else if(fCabledSignal==kZPA4 || fCabledSignal==kZPA4D) fScalerMap[fCurrScCh][4]=4;
}
- else if(fCabledSignal>=12 && fCabledSignal<=16 ||
- fCabledSignal>=71 && fCabledSignal<=75){
+ else if((fCabledSignal>=12 && fCabledSignal<=16) ||
+ (fCabledSignal>=71 && fCabledSignal<=75)){
fScalerMap[fCurrScCh][3] = 1; //ZNC
//
- if(fCabledSignal==12 || fCabledSignal==71) fScalerMap[fCurrScCh][4]=0;
- else if(fCabledSignal==13 || fCabledSignal==72) fScalerMap[fCurrScCh][4]=1;
- else if(fCabledSignal==14 || fCabledSignal==73) fScalerMap[fCurrScCh][4]=2;
- else if(fCabledSignal==15 || fCabledSignal==74) fScalerMap[fCurrScCh][4]=3;
- else if(fCabledSignal==16 || fCabledSignal==75) fScalerMap[fCurrScCh][4]=4;
+ if(fCabledSignal==kZNCC || fCabledSignal==kZNCCD) fScalerMap[fCurrScCh][4]=0;
+ else if(fCabledSignal==kZNC1 || fCabledSignal==kZNC1D) fScalerMap[fCurrScCh][4]=1;
+ else if(fCabledSignal==kZNC2 || fCabledSignal==kZNC2D) fScalerMap[fCurrScCh][4]=2;
+ else if(fCabledSignal==kZNC3 || fCabledSignal==kZNC3D) fScalerMap[fCurrScCh][4]=3;
+ else if(fCabledSignal==kZNC4 || fCabledSignal==kZNC4D) fScalerMap[fCurrScCh][4]=4;
}
- else if(fCabledSignal>=17 && fCabledSignal<=21 ||
- fCabledSignal>=76 && fCabledSignal<=80){
+ else if((fCabledSignal>=17 && fCabledSignal<=21) ||
+ (fCabledSignal>=76 && fCabledSignal<=80)){
fScalerMap[fCurrScCh][3] = 2; //ZPC
//
- if(fCabledSignal==17 || fCabledSignal==76) fScalerMap[fCurrScCh][4]=0;
- else if(fCabledSignal==18 || fCabledSignal==77) fScalerMap[fCurrScCh][4]=1;
- else if(fCabledSignal==19 || fCabledSignal==78) fScalerMap[fCurrScCh][4]=2;
- else if(fCabledSignal==20 || fCabledSignal==79) fScalerMap[fCurrScCh][4]=3;
- else if(fCabledSignal==21 || fCabledSignal==80) fScalerMap[fCurrScCh][4]=4;
+ if(fCabledSignal==kZPCC || fCabledSignal==kZPCCD) fScalerMap[fCurrScCh][4]=0;
+ else if(fCabledSignal==kZPC1 || fCabledSignal==kZPC1D) fScalerMap[fCurrScCh][4]=1;
+ else if(fCabledSignal==kZPC2 || fCabledSignal==kZPC2D) fScalerMap[fCurrScCh][4]=2;
+ else if(fCabledSignal==kZPC3 || fCabledSignal==kZPC3D) fScalerMap[fCurrScCh][4]=3;
+ else if(fCabledSignal==kZPC4 || fCabledSignal==kZPC4D) fScalerMap[fCurrScCh][4]=4;
}
else if(fCabledSignal==22 || fCabledSignal==23 ||
fCabledSignal==81 || fCabledSignal==82){
fScalerMap[fCurrScCh][3] = 3; // ZEM
//
- if(fCabledSignal==22 || fCabledSignal==81) fScalerMap[fCurrScCh][4]=1;
- else if(fCabledSignal==23 || fCabledSignal==82) fScalerMap[fCurrScCh][4]=2;
+ if(fCabledSignal==kZEM1 || fCabledSignal==kZEM1D) fScalerMap[fCurrScCh][4]=1;
+ else if(fCabledSignal==kZEM2 || fCabledSignal==kZEM2D) fScalerMap[fCurrScCh][4]=2;
}
// Ch debug.
- //printf("\t VME scaler mod. %d ch. %d, signal %d",fScalerMap[fCurrScCh][0],fADCChannel,fCabledSignal);
- //if(fCabledSignal!=0 && fCabledSignal!=1) printf(" det. %d sec. %d\n",fScalerMap[fCurrScCh][3],fScalerMap[fCurrScCh][4]);
- //else printf(" Signal void/not connected\n");
+ /*printf("\t VME scaler mod. %d ch. %d, signal %d",fScalerMap[fCurrScCh][0],fADCChannel,fCabledSignal);
+ if(fCabledSignal!=0 && fCabledSignal!=1) printf(" det. %d sec. %d\n",fScalerMap[fCurrScCh][3],fScalerMap[fCurrScCh][4]);
+ else printf(" Signal void/not connected\n");*/
fCurrScCh++;
}
+ else if(fModType==KV1290 && fADCModule==kZDCTDCGeo){ // ******** ZDC TDC **************************
+ fIsChMapping = kTRUE;
+ fTDCMap[fCurrTDCCh][0] = fADCModule;
+ fTDCMap[fCurrTDCCh][1] = fADCChannel;
+ fTDCMap[fCurrTDCCh][2] = fCabledSignal;
+
+ fCurrTDCCh++;
+
+ // Ch debug.
+ //printf("\tZDC TDC: mod. %d ch. %d, signal %d\n",fADCModule,fADCChannel,fCabledSignal);
+ }
/*else if(fModType == kTRG){ // **** scalers from trigger card
//printf("\t Trigger scaler mod. %d ch. %d, signal %d\n",fADCModule,fADCChannel,fCabledSignal);
}
// ---------------------------------------------
else if(fPosition>=fDataOffset){
- //printf("AliZDCRawStream: fSODReading = %d\n", fSODReading);
if(!fSODReading && !fIsMapRead) ReadChMap();
// !!!!!!!!!!!!!!! DARC readout card only !!!!!!!!!!!
if((fBuffer & 0x07000000) != 0x06000000){
fRawReader->AddMajorErrorLog(kZDCDataError);
}
- else if((fBuffer & 0x07000000) == 0x06000001){ // Corrupted event!!!
- fIsADCEventGood = kFALSE;
- }
+ //else if((fBuffer & 0x07000000) == 0x06000001){ // Corrupted event!!!
+ // fIsADCEventGood = kFALSE;
+ //}
}
// If the not valid datum isn't followed by the 1st ADC header
}
// Get geo address of current word
- fADCModule = (Int_t) ((fBuffer & 0xf8000000)>>27);
- if(fIsTDCHeaderRead)fADCModule = kZDCTDCGeo;
+ if(fIsTDCHeaderRead && fIsZDCTDCHeader) fADCModule = kZDCTDCGeo;
+ else if(fIsTDCHeaderRead && fIsADDTDCHeader) fADCModule = kADDTDCGeo;
+ else fADCModule = (Int_t) ((fBuffer & 0xf8000000)>>27);
// ************************************ ADC MODULES ************************************
- if(fADCModule>=kFirstADCGeo && fADCModule<=kLastADCGeo){
+ if(fADCModule>=kFirstADCGeo && fADCModule<=kLastADCGeo &&
+ !fIsTriggerHistory && !fIsScHeaderRead && !fIsTriggerScaler){
// *** ADC header
if((fBuffer & 0x07000000) == 0x02000000){
fIsADCHeader = kTRUE;
fADCValue = (fBuffer & 0xfff);
//
//printf(" AliZDCRawStream -> ADC DATUM: mod. %d ch. %d gain %d value %d\n",
- // fADCModule,fADCChannel,fADCGain,fADCValue);
+ //fADCModule,fADCChannel,fADCGain,fADCValue);
// Checking if the channel map for the ADCs has been provided/read
if(fMapADC[0][0]==-1){
break;
}
}
- if(foundMapEntry==kFALSE){
+ if(foundMapEntry==kFALSE && fEvType==7){
AliWarning(Form(" No valid entry in ADC mapping for raw data %d ADCmod. %d ch. %d\n",
fPosition,fADCModule,fADCChannel));
}
- //
- //printf("AliZDCRawStream -> ADCmod. %d ch. %d -> det %d sec %d\n",
- // fADCModule,fADCChannel,fSector[0],fSector[1]);
-
+
// Final checks
- if(foundMapEntry==kTRUE){
+ if(foundMapEntry==kTRUE && fEvType==7){
if(fSector[0]<1 || fSector[0]>5){
AliWarning(Form(" No valid detector assignment: %d",fSector[0]));
fRawReader->AddMajorErrorLog(kInvalidSector);
// *** ADC EOB
else if((fBuffer & 0x07000000) == 0x04000000){
fIsADCEOB = kTRUE;
- //printf(" AliZDCRawStream -> EOB --------------------------\n");
+ //printf(" AliZDCRawStream -> ADC EOB --------------------------\n");
}
}//ADC module
// ********************************* ADD ADC *********************************
}
// *** ADC data word
else if((fBuffer & 0x07000000) == 0x00000000){
- fIsADCDataWord = kTRUE;
+ fIsADDChannel = kTRUE;
fADCChannel = ((fBuffer & 0x1e0000) >> 17);
fADCGain = ((fBuffer & 0x10000) >> 16);
fADCValue = (fBuffer & 0xfff);
// *** ADC EOB
else if((fBuffer & 0x07000000) == 0x04000000){
fIsADCEOB = kTRUE;
- //printf(" AliZDCRawStream -> EOB --------------------------\n");
+ //printf(" AliZDCRawStream -> ADD ADC EOB --------------------------\n");
}
}
- // ********************************* ZDC TDC *********************************
- else if(fADCModule==kZDCTDCGeo && fIsTDCHeaderRead==kFALSE){
- fIsZDCTDCHeader = kTRUE;
+ // ********************************* TDC *********************************
+ else if(fADCModule==kTDCFakeGeo && fIsTDCHeaderRead==kFALSE){
+ // *** TDC header
fIsTDCHeaderRead = kTRUE;
fTDCStartCounter = fPosition;
- //Ch. debug
- //printf(" AliZDCRawStream -> ZDC TDC: mod.%d\n",fADCModule);
- }
- // ********************************* ADD TDC *********************************
- else if(fADCModule == kADDTDCGeo){
- // *** TDC header
- if((fBuffer & 0x07000000) == 0x02000000){
- fIsADDTDCHeader = kTRUE;
- fADCNChannels = ((fBuffer & 0x00003f00)>>8);
- //printf(" AliZDCRawStream -> ADD TDC: mod.%d has %d ch. \n",fADCModule,fADCNChannels);
- }
- // *** TDC word
- else if((fBuffer & 0x07000000) == 0x00000000){
- fIsADDTDCdatum = kTRUE;
+ // GEO address from TDC header
+ fADCModule = (Int_t) (fBuffer & 0x1f);
+ if(fADCModule==kZDCTDCGeo){ // *** ZDC TDC
+ fIsZDCTDCHeader = kTRUE;
+ //Ch. debug
+ //printf(" AliZDCRawStream -> ZDC TDC header: mod.%d\n",fADCModule);
}
- // *** TDC EOB
- if((fBuffer & 0x07000000) == 0x04000000){
- fIsADCEOB = kTRUE;
- //printf(" AliZDCRawStream -> ADD TDC EOB\n");
+ else if(fADCModule==kADDTDCGeo){ // *** ADD TDC
+ fIsADDTDCHeader = kTRUE;
+ //Ch. debug
+ //printf(" AliZDCRawStream -> ADD TDC: mod.%d\n",fADCModule);
}
- }
+ }
// ********************************* VME SCALER HEADER *********************************
else if(fADCModule == kScalerGeo){
if(fBuffer & 0x04000000 && fIsScHeaderRead==kFALSE){ // *** Scaler header
//printf(" AliZDCRawStream -> VME SCALER HEADER: geo %d Nwords %d TrigSource %d TrigNo. %d\n",
// fScGeo,fScNWords,fScTriggerSource,fScTriggerNumber);
}
- else if(!(fBuffer & 0x04000000)){
- fIsScEventGood = kFALSE;
- }
+ // Commented by C.O. & M.G. (23/09/2011)
+ //else if(!(fBuffer & 0x04000000) && fIsScHeaderRead==kFALSE){
+ // fIsScEventGood = kFALSE;
+ //}
}
// *********************************** PATTERN UNIT ***********************************
else if(fADCModule == kPUGeo){
// ********************************** VME SCALER DATA **********************************
// Reading VME scaler data
if(fIsScHeaderRead && fPosition>=fScStartCounter+1){ // *** Scaler word
- fADCModule=kScalerGeo; fIsADCDataWord=kFALSE; fIsScalerWord=kTRUE;
+ fADCModule=kScalerGeo;
+ fIsADCDataWord=kFALSE;
+ fIsScalerWord=kTRUE;
fScEvCounter = fBuffer;
Int_t nWords = (Int_t) (fScNWords);
if(fPosition == fScStartCounter+nWords) fIsScHeaderRead = kFALSE;
//Ch. debug
- //printf(" AliZDCRawStream -> scaler datum %d", fScEvCounter);
+ //printf(" AliZDCRawStream -> scaler datum %x \n", fScEvCounter);
}
// ********************************** ZDC TDC DATA **********************************
// ZDC TDC data
- if(fIsTDCHeaderRead && fPosition>=fTDCStartCounter+1){
+ if(fIsTDCHeaderRead && fIsZDCTDCHeader && fPosition>=fTDCStartCounter+1){
fIsADCDataWord=kFALSE; fIsScalerWord=kFALSE;
- //printf(" AliZDCRawStream -> ...skipping ZDC TDC datum\n");
- // For the moment we skip the TDC data
+ if(((fBuffer & 0xf0000000)==0x00000000) && (((fBuffer & 0x08000000) >> 27) == 0)){ // TDC datum
+ fADCChannel = (Int_t) ((fBuffer & 0x3e00000) >> 21);
+ fIsZDCTDCdatum = kTRUE;
+ fZDCTDCdatum = (Int_t) (fBuffer & 0x1fffff);
+ // Ch. debug
+ //printf(" AliZDCRawStream -> ZDC TDC mod. %d ch. %d datum %d\n",fADCModule,fADCChannel,fZDCTDCdatum);
+ }
+ if(((fBuffer & 0xf0000000) == 0x80000000) && ((fBuffer & 0x08000000) >> 27) == 0){
+ // Trailer
+ fIsTDCHeaderRead = kFALSE;
+ // Ch. debug
+ //printf(" AliZDCRawStream -> ZDC TDC global trailer\n");
+ }
+ }
+ // ********************************** ADD TDC DATA **********************************
+ // ADD TDC data
+ if(fIsTDCHeaderRead && fIsADDTDCHeader && fPosition>=fTDCStartCounter+1){
+ fIsADCDataWord=kFALSE; fIsScalerWord=kFALSE;
+ if(((fBuffer & 0xf0000000)==0x00000000) && (((fBuffer & 0x08000000) >> 27) == 0)){ // TDC datum
+ fADCChannel = (Int_t) ((fBuffer & 0x3e00000) >> 21);
+ fIsADDTDCdatum = kTRUE;
+ fADDTDCdatum = (Int_t) (fBuffer & 0x1fffff);
+ // Ch. debug
+ //printf(" AliZDCRawStream -> ADD TDC mod. %d ch. %d datum %d\n",fADCModule,fADCChannel,fADDTDCdatum);
+ }
if(((fBuffer & 0xf0000000) == 0x80000000) && ((fBuffer & 0x08000000) >> 27) == 0){
+ // Trailer
fIsTDCHeaderRead = kFALSE;
// Ch. debug
- //printf(" AliZDCRawStream -> ZDC TDC trailer\n");
+ //printf(" AliZDCRawStream -> ADD TDC global trailer\n");
}
}
// ******************************** TRIGGER SCALER DATA ********************************
}
}
// Ch. debug
- //printf(" AliZDCRawStream -> Trigger history word %d\n", fPosition-fTrigHistStart);
+ //printf(" AliZDCRawStream -> Trigger history word[%d] %x\n", fPosition, fBuffer);
}
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff