From: coppedis Date: Tue, 20 Sep 2011 13:04:23 +0000 (+0000) Subject: Correcting Digits2Raw + prints commented X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=7fe9b7212a4ad06e78c34e1e7b1c69518f68c9f8;p=u%2Fmrichter%2FAliRoot.git Correcting Digits2Raw + prints commented --- diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx index 5e5fc0dc369..8d3b556021c 100644 --- a/ZDC/AliZDC.cxx +++ b/ZDC/AliZDC.cxx @@ -526,7 +526,7 @@ void AliZDC::Digits2Raw() break; } } - else if(iDigit>knADCData1+knADCData2){ + else{ if(digit.GetSector(0)==mapADC[k][2] && digit.GetSector(1)==mapADC[k][3]){ lADCDataGEO = (UInt_t) mapADC[k][0]; lADCDataChannel = (UInt_t) mapADC[k][1]; @@ -535,12 +535,12 @@ void AliZDC::Digits2Raw() } } // Ch. debug - //printf(" det %d sec %d -> lADCDataGEO %d lADCDataChannel %d\n", - // digit.GetSector(0),digit.GetSector(1),lADCDataGEO,lADCDataChannel); + //printf("iDigit %d det %d sec %d -> lADCDataGEO %d lADCDataChannel %d\n", + // iDigit,digit.GetSector(0),digit.GetSector(1),lADCDataGEO,lADCDataChannel); if(lADCDataGEO==0){ if(indADC0>=knADCData1){ - AliError(" Problem with digit index 4 ADC0\n"); + AliWarning(" Problem with digit index 4 ADC0\n"); return; } Int_t indLG = indADC0+knADCData1; @@ -551,19 +551,18 @@ void AliZDC::Digits2Raw() lADCDataOvFlwHG << 12 | (lADCDataValue1[indADC0] & 0xfff); // Low gain ADC ch. if(digit.GetADCValue(1) > 2047) lADCDataOvFlwLG = 1; - lADCDataValue1[indLG-1] = digit.GetADCValue(1); + lADCDataValue1[indLG] = digit.GetADCValue(1); lADCData1[indLG] = lADCDataGEO << 27 | lADCDataChannel << 17 | 0x1 << 16 | lADCDataOvFlwLG << 12 | (lADCDataValue1[indLG] & 0xfff); + // Ch. debug + //printf(" lADCDataGEO %d ADCdataHG[%d] %d ADCdataLG[%d] %d\n", + // lADCDataGEO,indADC0,lADCDataValue1[indADC0],indLG,lADCDataValue1[indLG]); indADC0++; - // - // Ch. debug - //printf(" lADCDataGEO %d lADCDataValue1[%d] = %d lADCDataValue1[%d] = %d\n", - // lADCDataGEO,iDigit,lADCDataValue1[indLG],indLG,lADCDataValue1[indLG]); } else if(lADCDataGEO==1){ if(indADC1>=knADCData2){ - AliError(" Problem with digit index 4 ADC1\n"); + AliWarning(" Problem with digit index 4 ADC1\n"); return; } Int_t indLG = indADC1+knADCData2; @@ -577,16 +576,15 @@ void AliZDC::Digits2Raw() lADCDataValue2[indLG] = digit.GetADCValue(1); lADCData2[indLG] = lADCDataGEO << 27 | lADCDataChannel << 17 | 0x1 << 16 | lADCDataOvFlwLG << 12 | (lADCDataValue2[indLG] & 0xfff); + // Ch. debug + //printf(" lADCDataGEO %d ADCdataHG[%d] %d ADCdataLG[%d] %d\n", + // lADCDataGEO,indADC1,lADCDataValue2[indADC1],indLG,lADCDataValue2[indLG]); indADC1++; - // - //Ch. debug - //printf(" lADCDataGEO %d lADCDataValue2[%d] = %d lADCDataValue2[%d] = %d\n", - // lADCDataGEO,indHG,lADCDataValue2[indHG],indLG,lADCDataValue2[indLG]); } else if(lADCDataGEO==2){ if(indADC2>=knADCData3){ - AliError(" Problem with digit index 4 ADC2\n"); + AliWarning(" Problem with digit index 4 ADC2\n"); return; } Int_t indLG = indADC2+knADCData3; @@ -600,16 +598,15 @@ void AliZDC::Digits2Raw() lADCDataValue3[indLG] = digit.GetADCValue(1); lADCData3[indLG] = lADCDataGEO << 27 | lADCDataChannel << 17 | 0x1 << 16 | lADCDataOvFlwLG << 12 | (lADCDataValue3[indLG] & 0xfff); + // Ch. debug + //printf(" lADCDataGEO %d ADCdataHG[%d] %d ADCdataLG[%d] %d\n", + // lADCDataGEO,indADC2,lADCDataValue3[indADC2],indLG,lADCDataValue3[indLG]); indADC2++; - // - //Ch. debug - //printf(" lADCDataGEO %d lADCDataValue3[%d] = %d lADCDataValue3[%d] = %d\n", - // lADCDataGEO,indHG,lADCDataValue3[indHG],indLG,lADCDataValue3[indLG]); } else if(lADCDataGEO==3){ if(indADC3>=knADCData4){ - AliError(" Problem with digit index 4 ADC2\n"); + AliWarning(" Problem with digit index 4 ADC2\n"); return; } Int_t indLG = indADC3+knADCData4; @@ -623,12 +620,11 @@ void AliZDC::Digits2Raw() lADCDataValue4[indLG] = digit.GetADCValue(1); lADCData4[indLG] = lADCDataGEO << 27 | lADCDataChannel << 17 | 0x1 << 16 | lADCDataOvFlwLG << 12 | (lADCDataValue4[indLG] & 0xfff); + // Ch. debug + //printf(" lADCDataGEO %d ADCdataHG[%d] %d ADCdataLG[%d] %d\n", + // lADCDataGEO,indADC3,lADCDataValue4[indADC3],indLG,lADCDataValue4[indLG]); indADC3++; - // - // Ch. debug - //printf(" lADCDataGEO %d lADCDataValue4[%d] = %d lADCDataValue4[%d] = %d\n", - // lADCDataGEO,indHG,lADCDataValue4[indHG],indLG,lADCDataValue4[indLG]); } } diff --git a/ZDC/AliZDCDigitizer.cxx b/ZDC/AliZDCDigitizer.cxx index 124328ef777..d8b43c933dc 100644 --- a/ZDC/AliZDCDigitizer.cxx +++ b/ZDC/AliZDCDigitizer.cxx @@ -317,10 +317,10 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/) specPProj = ((AliGenHijingEventHeader*) genHeader)->ProjSpectatorsp(); specNTarg = ((AliGenHijingEventHeader*) genHeader)->TargSpectatorsn(); specPTarg = ((AliGenHijingEventHeader*) genHeader)->TargSpectatorsp(); - printf("\n\t AliZDCDigitizer: b = %1.2f fm\n" + /*printf("\n\t AliZDCDigitizer: b = %1.2f fm\n" " \t PROJ.: #spectator n %d, #spectator p %d\n" " \t TARG.: #spectator n %d, #spectator p %d\n", - impPar, specNProj, specPProj, specNTarg, specPTarg); + impPar, specNProj, specPProj, specNTarg, specPTarg);*/ } } @@ -332,13 +332,13 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/) Int_t freeSpecNTarg, freeSpecPTarg; Fragmentation(impPar, specNTarg, specPTarg, freeSpecNTarg, freeSpecPTarg); SpectatorSignal(1, freeSpecNProj, pm); - printf("\t AliZDCDigitizer -> Adding signal for %d PROJ free spectator n",freeSpecNProj); +// printf("\t AliZDCDigitizer -> Adding signal for %d PROJ free spectator n",freeSpecNProj); SpectatorSignal(2, freeSpecPProj, pm); - printf(" and %d free spectator p\n",freeSpecPProj); +// printf(" and %d free spectator p\n",freeSpecPProj); SpectatorSignal(3, freeSpecNTarg, pm); - printf("\t AliZDCDigitizer -> Adding signal for %d TARG free spectator n",freeSpecNTarg); +// printf("\t AliZDCDigitizer -> Adding signal for %d TARG free spectator n",freeSpecNTarg); SpectatorSignal(4, freeSpecPTarg, pm); - printf(" and %d free spectator p\n\n",freeSpecPTarg); +// printf(" and %d free spectator p\n\n",freeSpecPTarg); }