/* History of cvs commits:
*
* $Log$
+ * Revision 1.100 2007/10/10 09:05:10 schutz
+ * Changing name QualAss to QA
+ *
+ * Revision 1.99 2007/09/30 17:08:20 schutz
+ * Introducing the notion of QA data acquisition cycle (needed by online)
+ *
+ * Revision 1.98 2007/09/26 14:22:17 cvetan
+ * Important changes to the reconstructor classes. Complete elimination of the run-loaders, which are now steered only from AliReconstruction. Removal of the corresponding Reconstruct() and FillESD() methods.
+ *
+ * Revision 1.97 2007/08/07 14:12:03 kharlov
+ * Quality assurance added (Yves Schutz)
+ *
+ * Revision 1.96 2007/04/28 10:43:36 policheh
+ * Dead channels simulation: digit energy sets to 0.
+ *
+ * Revision 1.95 2007/04/10 07:20:52 kharlov
+ * Decalibration should use the same CDB as calibration in AliPHOSClusterizerv1
+ *
+ * Revision 1.94 2007/02/01 10:34:47 hristov
+ * Removing warnings on Solaris x86
+ *
+ * Revision 1.93 2006/10/17 13:17:01 kharlov
+ * Replace AliInfo by AliDebug
+ *
+ * Revision 1.92 2006/08/28 10:01:56 kharlov
+ * Effective C++ warnings fixed (Timur Pocheptsov)
+ *
+ * Revision 1.91 2006/04/29 20:25:30 hristov
+ * Decalibration is implemented (Yu.Kharlov)
+ *
+ * Revision 1.90 2006/04/22 10:30:17 hristov
+ * Add fEnergy to AliPHOSDigit and operate with EMC amplitude in energy units (Yu.Kharlov)
+ *
+ * Revision 1.89 2006/04/11 15:22:59 hristov
+ * run number in query set to -1: forces AliCDBManager to use its run number (A.Colla)
+ *
* Revision 1.88 2006/03/13 14:05:43 kharlov
* Calibration objects for EMC and CPV
*
#include "AliPHOSSDigitizer.h"
#include "AliPHOSGeometry.h"
#include "AliPHOSTick.h"
+#include "AliPHOSQADataMaker.h"
ClassImp(AliPHOSDigitizer)
//____________________________________________________________________________
- AliPHOSDigitizer::AliPHOSDigitizer():AliDigitizer("",""),
- fInput(0),
- fInputFileNames(0x0),
- fEventNames(0x0)
+AliPHOSDigitizer::AliPHOSDigitizer() :
+ AliDigitizer("",""),
+ fDefaultInit(kTRUE),
+ fDigitsInRun(0),
+ fInit(kFALSE),
+ fInput(0),
+ fInputFileNames(0x0),
+ fEventNames(0x0),
+ fEmcCrystals(0),
+ fPinNoise(0.f),
+ fEMCDigitThreshold(0.f),
+ fCPVNoise(0.f),
+ fCPVDigitThreshold(0.f),
+ fTimeResolution(0.f),
+ fTimeThreshold(0.f),
+ fTimeSignalLength(0.f),
+ fADCchanelEmc(0.f),
+ fADCpedestalEmc(0.f),
+ fNADCemc(0),
+ fADCchanelCpv(0.f),
+ fADCpedestalCpv(0.f),
+ fNADCcpv(0),
+ fEventFolderName(""),
+ fFirstEvent(0),
+ fLastEvent(0),
+ fQADM (0x0),
+ fEventCounter(0)
{
// ctor
InitParameters() ;
- fDefaultInit = kTRUE ;
fManager = 0 ; // We work in the standalong mode
- fEventFolderName = "" ;
}
//____________________________________________________________________________
AliPHOSDigitizer::AliPHOSDigitizer(TString alirunFileName,
TString eventFolderName):
- AliDigitizer("PHOS"+AliConfig::Instance()->GetDigitizerTaskName(),
- alirunFileName),
- fInputFileNames(0), fEventNames(0), fEventFolderName(eventFolderName)
+ AliDigitizer("PHOS"+AliConfig::Instance()->GetDigitizerTaskName(), alirunFileName),
+ fDefaultInit(kFALSE),
+ fDigitsInRun(0),
+ fInit(kFALSE),
+ fInput(0),
+ fInputFileNames(0x0),
+ fEventNames(0x0),
+ fEmcCrystals(0),
+ fPinNoise(0.f),
+ fEMCDigitThreshold(0.f),
+ fCPVNoise(0.f),
+ fCPVDigitThreshold(0.f),
+ fTimeResolution(0.f),
+ fTimeThreshold(0.f),
+ fTimeSignalLength(0.f),
+ fADCchanelEmc(0.f),
+ fADCpedestalEmc(0.f),
+ fNADCemc(0),
+ fADCchanelCpv(0.f),
+ fADCpedestalCpv(0.f),
+ fNADCcpv(0),
+ fEventFolderName(eventFolderName),
+ fFirstEvent(0),
+ fLastEvent(0),
+ fQADM (0x0),
+ fEventCounter(0)
{
// ctor
InitParameters() ;
Init() ;
fDefaultInit = kFALSE ;
fManager = 0 ; // We work in the standalong mode
+ //Initialize the quality assurance data maker only once
+ fQADM = new AliPHOSQADataMaker() ;
+ //FIXME: get the run number
+ Int_t run = 0 ;
+ //EMXIF
+ GetQADataMaker()->Init(AliQA::kDIGITS, run, fgkCycles) ;
+ GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ;
}
//____________________________________________________________________________
-AliPHOSDigitizer::AliPHOSDigitizer(const AliPHOSDigitizer & d)
- : AliDigitizer(d)
+AliPHOSDigitizer::AliPHOSDigitizer(const AliPHOSDigitizer & d) :
+ AliDigitizer(d),
+ fDefaultInit(d.fDefaultInit),
+ fDigitsInRun(d.fDigitsInRun),
+ fInit(d.fInit),
+ fInput(d.fInput),
+ fInputFileNames(0x0),//?
+ fEventNames(0x0),//?
+ fEmcCrystals(d.fEmcCrystals),
+ fPinNoise(d.fPinNoise),
+ fEMCDigitThreshold(d.fEMCDigitThreshold),
+ fCPVNoise(d.fCPVNoise),
+ fCPVDigitThreshold(d.fCPVDigitThreshold),
+ fTimeResolution(d.fTimeResolution),
+ fTimeThreshold(d.fTimeThreshold),
+ fTimeSignalLength(d.fTimeSignalLength),
+ fADCchanelEmc(d.fADCchanelEmc),
+ fADCpedestalEmc(d.fADCpedestalEmc),
+ fNADCemc(d.fNADCemc),
+ fADCchanelCpv(d.fADCchanelCpv),
+ fADCpedestalCpv(d.fADCpedestalCpv),
+ fNADCcpv(d.fNADCcpv),
+ fEventFolderName(d.fEventFolderName),
+ fFirstEvent(d.fFirstEvent),
+ fLastEvent(d.fLastEvent),
+ fQADM (d.fQADM),
+ fEventCounter(0)
+
{
// copyy ctor
-
SetName(d.GetName()) ;
SetTitle(d.GetTitle()) ;
- fPinNoise = d.fPinNoise ;
- fEMCDigitThreshold = d.fEMCDigitThreshold ;
- fCPVNoise = d.fCPVNoise ;
- fCPVDigitThreshold = d.fCPVDigitThreshold ;
- fTimeResolution = d.fTimeResolution ;
- fTimeThreshold = d.fTimeThreshold ;
- fTimeSignalLength = d.fTimeSignalLength ;
- fADCchanelEmc = d.fADCchanelEmc ;
- fADCpedestalEmc = d.fADCpedestalEmc ;
- fNADCemc = d.fNADCemc ;
- fADCchanelCpv = d.fADCchanelCpv ;
- fADCpedestalCpv = d.fADCpedestalCpv ;
- fNADCcpv = d.fNADCcpv ;
- fEventFolderName = d.fEventFolderName;
+//Initialize the quality assurance data maker only once
+ //FIXME: get the run number
+ Int_t run = 0 ;
+ //EMXIF
+ GetQADataMaker()->Init(AliQA::kDIGITS, run, fgkCycles) ;
+ GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ;
}
//____________________________________________________________________________
-AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd):
- AliDigitizer(rd,"PHOS"+AliConfig::Instance()->GetDigitizerTaskName()),
- fEventFolderName(0)
+AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd) :
+ AliDigitizer(rd,"PHOS"+AliConfig::Instance()->GetDigitizerTaskName()),
+ fDefaultInit(kFALSE),
+ fDigitsInRun(0),
+ fInit(kFALSE),
+ fInput(0),
+ fInputFileNames(0x0),
+ fEventNames(0x0),
+ fEmcCrystals(0),
+ fPinNoise(0.f),
+ fEMCDigitThreshold(0.f),
+ fCPVNoise(0.f),
+ fCPVDigitThreshold(0.f),
+ fTimeResolution(0.f),
+ fTimeThreshold(0.f),
+ fTimeSignalLength(0.f),
+ fADCchanelEmc(0.f),
+ fADCpedestalEmc(0.f),
+ fNADCemc(0),
+ fADCchanelCpv(0.f),
+ fADCpedestalCpv(0.f),
+ fNADCcpv(0),
+ fEventFolderName(fManager->GetInputFolderName(0)),
+ fFirstEvent(0),
+ fLastEvent(0),
+ fQADM (0x0),
+ fEventCounter(0)
+
{
// ctor Init() is called by RunDigitizer
fManager = rd ;
- fEventFolderName = fManager->GetInputFolderName(0) ;
SetTitle(dynamic_cast<AliStream*>(fManager->GetInputStream(0))->GetFileName(0));
InitParameters() ;
fDefaultInit = kFALSE ;
+//Initialize the quality assurance data maker only once
+ fQADM = new AliPHOSQADataMaker() ;
+ //FIXME: get the run number
+ Int_t run = 0 ;
+ //EMXIF
+ GetQADataMaker()->Init(AliQA::kDIGITS, run) ;
+ GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ;
}
//____________________________________________________________________________
// dtor
delete [] fInputFileNames ;
delete [] fEventNames ;
-
+
+ delete fQADM ;
+
}
//____________________________________________________________________________
Int_t ReadEvent = event ;
if (fManager)
ReadEvent = dynamic_cast<AliStream*>(fManager->GetInputStream(0))->GetCurrentEventNumber() ;
- AliInfo(Form("Adding event %d from input stream 0 %s %s",
- ReadEvent, GetTitle(), fEventFolderName.Data())) ;
+ AliDebug(1,Form("Adding event %d from input stream 0 %s %s",
+ ReadEvent, GetTitle(), fEventFolderName.Data())) ;
gime->Event(ReadEvent, "S") ;
TClonesArray * digits = gime->Digits() ;
digits->Clear() ;
for(i = 1 ; i < fInput ; i++){
TString tempo(fEventNames[i]) ;
tempo += i ;
- AliPHOSGetter * gime = AliPHOSGetter::Instance(fInputFileNames[i], tempo) ;
+ AliPHOSGetter * gime1 = AliPHOSGetter::Instance(fInputFileNames[i], tempo) ;
if (fManager)
ReadEvent = dynamic_cast<AliStream*>(fManager->GetInputStream(i))->GetCurrentEventNumber() ;
AliInfo(Form("Adding event %d from input stream %d %s %s",
ReadEvent, i, fInputFileNames[i].Data(), tempo.Data())) ;
- gime->Event(ReadEvent,"S");
- sdigArray->AddAt(gime->SDigits(), i) ;
+ gime1->Event(ReadEvent,"S");
+ sdigArray->AddAt(gime1->SDigits(), i) ;
}
- //Find the first crystall with signal
+ //Find the first crystal with signal
Int_t nextSig = 200000 ;
TClonesArray * sdigits ;
for(i = 0 ; i < fInput ; i++){
//Put Noise contribution
for(absID = 1 ; absID <= nEMC ; absID++){
Float_t noise = gRandom->Gaus(0., fPinNoise) ;
- new((*digits)[absID-1]) AliPHOSDigit( -1, absID, sDigitizer->Digitize(noise), TimeOfNoise() ) ;
+ // YVK: do not digitize amplitudes for EMC
+// new((*digits)[absID-1]) AliPHOSDigit( -1, absID, sDigitizer->Digitize(noise), TimeOfNoise() ) ;
+ new((*digits)[absID-1]) AliPHOSDigit( -1, absID, noise, TimeOfNoise() ) ;
//look if we have to add signal?
digit = dynamic_cast<AliPHOSDigit *>(digits->At(absID-1)) ;
//Add SDigits from all inputs
ticks->Clear() ;
Int_t contrib = 0 ;
- Float_t a = digit->GetAmp() ;
+ Float_t a = digit->GetEnergy() ;
Float_t b = TMath::Abs( a / fTimeSignalLength) ;
//Mark the beginning of the signal
new((*ticks)[contrib++]) AliPHOSTick(digit->GetTime(),0, b);
- //Mark the end of the ignal
+ //Mark the end of the signal
new((*ticks)[contrib++]) AliPHOSTick(digit->GetTime()+fTimeSignalLength, -a, -b);
//loop over inputs
primaryoffset = 10000000*i ;
curSDigit->ShiftPrimary(primaryoffset) ;
- a = curSDigit->GetAmp() ;
+ a = curSDigit->GetEnergy() ;
b = a /fTimeSignalLength ;
new((*ticks)[contrib++]) AliPHOSTick(curSDigit->GetTime(),0, b);
new((*ticks)[contrib++]) AliPHOSTick(curSDigit->GetTime()+fTimeSignalLength, -a, -b);
- *digit = *digit + *curSDigit ; //add energies
-
+ *digit += *curSDigit ; //add energies
+
index[i]++ ;
if( dynamic_cast<TClonesArray *>(sdigArray->At(i))->GetEntriesFast() > index[i] )
curSDigit = dynamic_cast<AliPHOSDigit*>(dynamic_cast<TClonesArray *>(sdigArray->At(i))->At(index[i])) ;
curSDigit->ShiftPrimary(primaryoffset) ;
//add energies
- *digit = *digit + *curSDigit ;
+ *digit += *curSDigit ;
index[i]++ ;
if( dynamic_cast<TClonesArray *>(sdigArray->At(i))->GetEntriesFast() > index[i] )
curSDigit = dynamic_cast<AliPHOSDigit*>( dynamic_cast<TClonesArray *>(sdigArray->At(i))->At(index[i]) ) ;
//remove digits below thresholds
for(i = 0 ; i < nEMC ; i++){
digit = dynamic_cast<AliPHOSDigit*>( digits->At(i) ) ;
- if(sDigitizer->Calibrate( digit->GetAmp() ) < fEMCDigitThreshold)
+ DecalibrateEMC(digit);
+ if(digit->GetEnergy() < fEMCDigitThreshold)
digits->RemoveAt(i) ;
else
digit->SetTime(gRandom->Gaus(digit->GetTime(),fTimeResolution) ) ;
for(i = nEMC; i < nCPV ; i++)
- if( sDigitizer->Calibrate( dynamic_cast<AliPHOSDigit*>(digits->At(i))->GetAmp() ) < fCPVDigitThreshold )
+// if( sDigitizer->Calibrate( dynamic_cast<AliPHOSDigit*>(digits->At(i))->GetAmp() ) < fCPVDigitThreshold )
+ if( dynamic_cast<AliPHOSDigit*>(digits->At(i))->GetEnergy() < fCPVDigitThreshold )
digits->RemoveAt(i) ;
digits->Compress() ;
for (i = 0 ; i < ndigits ; i++) {
digit = dynamic_cast<AliPHOSDigit*>( digits->At(i) ) ;
digit->SetIndexInList(i) ;
- Float_t energy = sDigitizer->Calibrate(digit->GetAmp()) ;
- digit->SetAmp(DigitizeEnergy(energy,digit->GetId()) ) ;
+ if(digit->GetId() > fEmcCrystals){ //digitize CPV only
+ digit->SetAmp(DigitizeCPV(digit->GetEnergy(),digit->GetId()) ) ;
+ }
}
+
+ Int_t relId[4];
+
+ //set amplitudes in bad channels to zero
+ for(i = 0 ; i <digits->GetEntries(); i++){
+ digit = dynamic_cast<AliPHOSDigit*>( digits->At(i) ) ;
+ gime->PHOSGeometry()->AbsToRelNumbering(digit->GetId(),relId);
+ if(relId[1] == 0) // Emc
+ if(gime->CalibData()->IsBadChannelEmc(relId[0],relId[3],relId[2])) digit->SetEnergy(0.);
+ }
+
}
//____________________________________________________________________________
-Int_t AliPHOSDigitizer::DigitizeEnergy(Float_t energy, Int_t absId)
+void AliPHOSDigitizer::DecalibrateEMC(AliPHOSDigit *digit)
+{
+ // Decalibrate EMC digit, i.e. change its energy by a factor read from CDB
+
+ AliPHOSGetter* gime = AliPHOSGetter::Instance();
+
+ if(!gime->CalibData()) {
+ AliPHOSCalibData* cdb = new AliPHOSCalibData(-1);
+ gime->SetCalibData(cdb);
+ }
+
+ //Determine rel.position of the cell absolute ID
+ Int_t relId[4];
+ gime->PHOSGeometry()->AbsToRelNumbering(digit->GetId(),relId);
+ Int_t module=relId[0];
+ Int_t row =relId[2];
+ Int_t column=relId[3];
+ Float_t decalibration = gime->CalibData()->GetADCchannelEmc(module,column,row);
+ Float_t energy = digit->GetEnergy() / decalibration;
+ digit->SetEnergy(energy);
+}
+//____________________________________________________________________________
+Int_t AliPHOSDigitizer::DigitizeCPV(Float_t charge, Int_t absId)
{
- // Returns digitized value of the energy in a cell absId
+ // Returns digitized value of the CPV charge in a pad absId
AliPHOSGetter* gime = AliPHOSGetter::Instance();
if(!gime->CalibData()) {
- //AliPHOSCalibData* cdb = new AliPHOSCalibData(gAlice->GetRunNumber()); // original
AliPHOSCalibData* cdb = new AliPHOSCalibData(-1); // use AliCDBManager's run number
gime->SetCalibData(cdb);
}
Int_t relId[4];
gime->PHOSGeometry()->AbsToRelNumbering(absId,relId);
Int_t module=relId[0];
- Int_t raw=relId[2];
+ Int_t row =relId[2];
Int_t column=relId[3];
- Int_t chanel ;
+ Int_t channel = 0;
- if(absId <= fEmcCrystals){ //digitize as EMC
+ if(absId > fEmcCrystals){ //digitize CPV only
//reading calibration data for cell absId.
//If no calibration DB found, accept default values.
if(gime->CalibData()) {
- fADCpedestalEmc = gime->CalibData()->GetADCpedestalEmc(module,column,raw);
- fADCchanelEmc = gime->CalibData()->GetADCchannelEmc(module,column,raw);
- }
-// printf("\t\tabsId %d ==>>module=%d column=%d raw=%d ped=%.4f gain=%.4f\n",
-// absId,module,column,raw,fADCpedestalEmc,fADCchanelEmc);
-
- chanel = (Int_t) TMath::Ceil((energy - fADCpedestalEmc)/fADCchanelEmc) ;
- if(chanel > fNADCemc ) chanel = fNADCemc ;
- }
- else{ //Digitize as CPV
- if(gime->CalibData()) {
- fADCpedestalCpv = gime->CalibData()->GetADCpedestalCpv(module,column,raw);
- fADCchanelCpv = gime->CalibData()->GetADCchannelCpv(module,column,raw);
+ fADCpedestalCpv = gime->CalibData()->GetADCpedestalCpv(module,column,row);
+ fADCchanelCpv = gime->CalibData()->GetADCchannelCpv( module,column,row);
}
- chanel = (Int_t) TMath::Ceil((energy - fADCpedestalCpv)/fADCchanelCpv) ;
- if(chanel > fNADCcpv ) chanel = fNADCcpv ;
+ channel = (Int_t) TMath::Ceil((charge - fADCpedestalCpv)/fADCchanelCpv) ;
+ if(channel > fNADCcpv ) channel = fNADCcpv ;
}
- return chanel ;
+ return channel ;
}
//____________________________________________________________________________
return ;
}
- if(strstr(option,"tim"))
- gBenchmark->Start("PHOSDigitizer");
+ // check the QA result for Hits and SDigits
+ AliQA * qa = AliQA::Instance(AliQA::kPHOS) ;
+ if ( qa->IsSet(AliQA::kPHOS, AliQA::kSIM, AliQA::kFATAL)) {
+ AliFatal("QA status in Hits and/or SDIGITS was Fatal") ;
+ } else if ( qa->IsSet(AliQA::kPHOS, AliQA::kSIM, AliQA::kERROR)) {
+ AliError("QA status in Hits and/or SDIGITS was Error") ;
+ } else if ( qa->IsSet(AliQA::kPHOS, AliQA::kSIM, AliQA::kWARNING) ) {
+ AliWarning("QA status in Hits and/or SDIGITS was Warning") ;
+ } else if ( qa->IsSet(AliQA::kPHOS, AliQA::kSIM, AliQA::kINFO) ) {
+ AliInfo("QA status in Hits and/or SDIGITS was Info") ;
+ }
+
+ if(strstr(option,"tim"))
+ gBenchmark->Start("PHOSDigitizer");
AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle()) ;
Int_t ievent ;
for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {
-
+ fEventCounter++ ;
gime->Event(ievent,"S") ;
Digitize(ievent) ; //Add prepared SDigits to digits and add the noise
+ //makes the quality assurance data
+ if (GetQADataMaker()->IsCycleDone() ) {
+ GetQADataMaker()->EndOfCycle(AliQA::kDIGITS) ;
+ GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ;
+ }
+ GetQADataMaker()->Exec(AliQA::kDIGITS, gime->Digits()) ;
+ GetQADataMaker()->Increment() ;
+
WriteDigits() ;
if(strstr(option,"deb"))
//increment the total number of Digits per run
fDigitsInRun += gime->Digits()->GetEntriesFast() ;
}
+
+ //Write the quality assurance data only after the last event
+ if ( fEventCounter == gime->MaxEvent() ) {
+ GetQADataMaker()->EndOfCycle(AliQA::kDIGITS) ;
+ GetQADataMaker()->Finish(AliQA::kDIGITS) ;
+ }
gime->PhosLoader()->CleanDigitizer();
{
// Set initial parameters Digitizer
- fPinNoise = 0.004 ;
- fEMCDigitThreshold = 0.012 ;
- fCPVNoise = 0.01;
- fCPVDigitThreshold = 0.09 ;
- fTimeResolution = 0.5e-9 ;
- fTimeSignalLength = 1.0e-9 ;
+ fPinNoise = 0.004 ; // [GeV]
+ fEMCDigitThreshold = 0.012 ; // [GeV]
+ fCPVNoise = 0.01; // [aux units]
+ fCPVDigitThreshold = 0.09 ; // [aux units]
+ fTimeResolution = 0.5e-9 ; // [sec]
+ fTimeSignalLength = 1.0e-9 ; // [sec]
fDigitsInRun = 0 ;
- fADCchanelEmc = 0.0015; // width of one ADC channel in GeV
- fADCpedestalEmc = 0.005 ; //
+ fADCchanelEmc = 1.0; // Coefficient between real and measured energies in EMC
+ fADCpedestalEmc = 0. ; //
fNADCemc = (Int_t) TMath::Power(2,16) ; // number of channels in EMC ADC
fADCchanelCpv = 0.0012 ; // width of one ADC channel in CPV 'popugais'
fADCpedestalCpv = 0.012 ; //
fNADCcpv = (Int_t) TMath::Power(2,12); // number of channels in CPV ADC
- fTimeThreshold = 0.001*10000000 ; //Means 1 MeV in terms of SDigits amplitude
+// fTimeThreshold = 0.001*10000000 ; //Means 1 MeV in terms of SDigits amplitude
+ fTimeThreshold = 0.001 ; // [GeV]
SetEventRange(0,-1) ;
}
printf("\nWriting digits to %s", gime->GetDigitsFileName().Data()) ;
printf("\nWith following parameters:\n") ;
- printf(" Electronics noise in EMC (fPinNoise) = %f\n", fPinNoise ) ;
- printf(" Threshold in EMC (fEMCDigitThreshold) = %f\n", fEMCDigitThreshold ) ;
- printf(" Noise in CPV (fCPVNoise) = %f\n", fCPVNoise ) ;
- printf(" Threshold in CPV (fCPVDigitThreshold) = %f\n",fCPVDigitThreshold ) ;
+ printf(" Electronics noise in EMC (fPinNoise) = %f GeV\n", fPinNoise ) ;
+ printf(" Threshold in EMC (fEMCDigitThreshold) = %f GeV\n", fEMCDigitThreshold ) ;
+ printf(" Noise in CPV (fCPVNoise) = %f aux units\n", fCPVNoise ) ;
+ printf(" Threshold in CPV (fCPVDigitThreshold) = %f aux units\n",fCPVDigitThreshold ) ;
printf(" ---------------------------------------------------\n") ;
}
else
digit = (AliPHOSDigit * ) digits->At(index) ;
if(digit->GetNprimary() == 0)
continue;
- printf("%6d %8d %6.5e %4d %2d :",
- digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ;
+// printf("%6d %8d %6.5e %4d %2d :",
+// digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ; // YVK
+ printf("%6d %.4f %6.5e %4d %2d :",
+ digit->GetId(), digit->GetEnergy(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ;
Int_t iprimary;
for (iprimary=0; iprimary<digit->GetNprimary(); iprimary++) {
printf("%d ",digit->GetPrimary(iprimary+1) ) ;
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff