X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCDigitizer.cxx;h=c683c4c54a15e3f1eaa74d56739dba01a482d7da;hb=dd230855aa4b1863ada2fb0c7a8d0832c939c80a;hp=ac5054cc702ccbc7bd6c50ba5e32fe9337d00266;hpb=8a2624cc301a4bd98b89b9a157086ab802486d48;p=u%2Fmrichter%2FAliRoot.git diff --git a/ZDC/AliZDCDigitizer.cxx b/ZDC/AliZDCDigitizer.cxx index ac5054cc702..c683c4c54a1 100644 --- a/ZDC/AliZDCDigitizer.cxx +++ b/ZDC/AliZDCDigitizer.cxx @@ -60,12 +60,10 @@ AliZDCDigitizer::AliZDCDigitizer() AliZDCDigitizer::AliZDCDigitizer(AliRunDigitizer* manager): AliDigitizer(manager) { - - // Constructor - fStorage = SetStorage("local://$ALICE_ROOT"); - + fIsCalibration=0; //By default the simulation doesn't create calib. data // Get calibration data fCalibData = GetCalibData(); + if(fIsCalibration!=0) printf("\n\t AliZDCDigitizer -> Creating calibration data (pedestals)\n"); } @@ -77,6 +75,23 @@ AliZDCDigitizer::~AliZDCDigitizer() } +//____________________________________________________________________________ +AliZDCDigitizer::AliZDCDigitizer(const AliZDCDigitizer &digitizer): + AliDigitizer() +{ + // Copy constructor + + for(Int_t i=0; i<6; i++){ + for(Int_t j=0; j<5; j++){ + fPMGain[i][j] = digitizer.fPMGain[i][j]; + } + } + for(Int_t i=0; i<2; i++) fADCRes[i] = digitizer.fADCRes[i]; + fIsCalibration = digitizer.fIsCalibration; + fCalibData = digitizer.fCalibData; + +} + //____________________________________________________________________________ Bool_t AliZDCDigitizer::Init() { @@ -102,7 +117,8 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/) { // Execute digitization - Float_t pm[5][5]; // !!! 2nd ZDC set added (needed for trigger purposes!) + // ------------------------------------------------------------ + // !!! 2nd ZDC set added (needed for trigger purposes!) // *** 1st 3 arrays are digits from REAL (simulated) hits // *** last 2 are copied from simulated digits // --- pm[0][...] = light in ZN right [C, Q1, Q2, Q3, Q4] @@ -110,11 +126,22 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/) // --- pm[2][...] = light in ZEM [x, 1, 2, x, x] // --- pm[3][...] = light in ZN left [C, Q1, Q2, Q3, Q4] ->NEW! // --- pm[4][...] = light in ZP left [C, Q1, Q2, Q3, Q4] ->NEW! - - for (Int_t iSector1=0; iSector1<5; iSector1++) - for (Int_t iSector2=0; iSector2<5; iSector2++) { + // ------------------------------------------------------------ + Float_t pm[5][5]; + for(Int_t iSector1=0; iSector1<5; iSector1++) + for(Int_t iSector2=0; iSector2<5; iSector2++){ pm[iSector1][iSector2] = 0; } + + // ------------------------------------------------------------ + // ### Out of time ADC added (22 channels) + // --- same codification as for signal PTMs (see above) + // ------------------------------------------------------------ + Float_t pmoot[5][5]; + for(Int_t iSector1=0; iSector1<5; iSector1++) + for(Int_t iSector2=0; iSector2<5; iSector2++){ + pmoot[iSector1][iSector2] = 0; + } // impact parameter and number of spectators Float_t impPar = -1; @@ -122,28 +149,28 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/) Int_t specP = 0; // loop over input streams - for (Int_t iInput = 0; iInputGetNinputs(); iInput++) { + for(Int_t iInput = 0; iInputGetNinputs(); iInput++){ // get run loader and ZDC loader AliRunLoader* runLoader = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(iInput)); AliLoader* loader = runLoader->GetLoader("ZDCLoader"); - if (!loader) continue; + if(!loader) continue; // load sdigits loader->LoadSDigits(); TTree* treeS = loader->TreeS(); - if (!treeS) continue; + if(!treeS) continue; AliZDCSDigit sdigit; AliZDCSDigit* psdigit = &sdigit; treeS->SetBranchAddress("ZDC", &psdigit); // loop over sdigits - for (Int_t iSDigit=0; iSDigitGetEntries(); iSDigit++) { + for(Int_t iSDigit=0; iSDigitGetEntries(); iSDigit++){ treeS->GetEntry(iSDigit); // - if (!psdigit) continue; - if ((sdigit.GetSector(1) < 0) || (sdigit.GetSector(1) > 4)) { + if(!psdigit) continue; + if((sdigit.GetSector(1) < 0) || (sdigit.GetSector(1) > 4)){ AliError(Form("\nsector[0] = %d, sector[1] = %d\n", sdigit.GetSector(0), sdigit.GetSector(1))); continue; @@ -153,34 +180,35 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/) /*printf("\n\t Detector %d, Tower %d -> pm[%d][%d] = %.0f \n", sdigit.GetSector(0), sdigit.GetSector(1),sdigit.GetSector(0)-1, sdigit.GetSector(1), pm[sdigit.GetSector(0)-1][sdigit.GetSector(1)]); // Chiara debugging! - */ + */ } loader->UnloadSDigits(); // get the impact parameter and the number of spectators in case of hijing - if (!runLoader->GetAliRun()) runLoader->LoadgAlice(); + if(!runLoader->GetAliRun()) runLoader->LoadgAlice(); AliHeader* header = runLoader->GetAliRun()->GetHeader(); - if (!header) continue; + if(!header) continue; AliGenEventHeader* genHeader = header->GenEventHeader(); - if (!genHeader) continue; - if (!genHeader->InheritsFrom(AliGenHijingEventHeader::Class())) continue; + if(!genHeader) continue; + if(!genHeader->InheritsFrom(AliGenHijingEventHeader::Class())) continue; impPar = ((AliGenHijingEventHeader*) genHeader)->ImpactParameter(); // specN = ((AliGenHijingEventHeader*) genHeader)->ProjSpectatorsn(); specP = ((AliGenHijingEventHeader*) genHeader)->ProjSpectatorsp(); AliDebug(2, Form("\n AliZDCDigitizer -> b = %f fm, Nspecn = %d, Nspecp = %d\n", impPar, specN, specP)); - printf("\n\t AliZDCDigitizer -> b = %f fm, Nspecn = %d, Nspecp = %d\n", impPar, specN, specP); + printf("\n\t AliZDCDigitizer -> b = %f fm, # generated spectator n = %d," + " # generated spectator p = %d\n", impPar, specN, specP); } // add spectators - if (impPar >= 0) { + if(impPar >= 0) { Int_t freeSpecN, freeSpecP; Fragmentation(impPar, specN, specP, freeSpecN, freeSpecP); - printf("\n\t AliZDCDigitizer ---- Adding signal for %d free spectator n\n",freeSpecN); + printf("\n\t AliZDCDigitizer -> Adding signal for %d free spectator n\n",freeSpecN); SpectatorSignal(1, freeSpecN, pm); - printf("\t AliZDCDigitizer ---- Adding signal for %d free spectator p\n\n",freeSpecP); + printf("\t AliZDCDigitizer -> Adding signal for %d free spectator p\n\n",freeSpecP); SpectatorSignal(2, freeSpecP, pm); } @@ -189,14 +217,14 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/) AliRunLoader* runLoader = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName()); AliLoader* loader = runLoader->GetLoader("ZDCLoader"); - if (!loader) { + if(!loader) { AliError("no ZDC loader found"); return; } // create the output tree const char* mode = "update"; - if (runLoader->GetEventNumber() == 0) mode = "recreate"; + if(runLoader->GetEventNumber() == 0) mode = "recreate"; loader->LoadDigits(mode); loader->MakeTree("D"); TTree* treeD = loader->TreeD(); @@ -207,17 +235,19 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/) // Create digits Int_t sector[2], sectorL[2]; - Int_t digi[2], digiL[2]; - for (sector[0]=1; sector[0]<=3; sector[0]++) - for (sector[1]=0; sector[1]<5; sector[1]++) { - if ((sector[0]==3) && ((sector[1]<1) || (sector[1]>2))) continue; - for (Int_t res=0; res<2; res++){ - digi[res] = Phe2ADCch(sector[0], sector[1], pm[sector[0]-1][sector[1]], res) + Int_t digi[2], digiL[2], digioot[2]; + for(sector[0]=1; sector[0]<=3; sector[0]++){ + for(sector[1]=0; sector[1]<5; sector[1]++){ + if((sector[0]==3) && ((sector[1]<1) || (sector[1]>2))) continue; + for(Int_t res=0; res<2; res++){ + digi[res] = Phe2ADCch(sector[0], sector[1], pm[sector[0]-1][sector[1]], res) + Pedestal(sector[0], sector[1], res); } - //printf("\t DIGIT added -> det = %d, quad = %d - digi[0,1] = [%d, %d]\n", - // sector[0], sector[1], digi[0], digi[1]); // Chiara debugging! - new(pdigit) AliZDCDigit(sector, digi); + /*printf("\t DIGIT added -> det = %d, quad = %d - digi[0,1] = [%d, %d]\n", + sector[0], sector[1], digi[0], digi[1]); // Chiara debugging! + */ + // + new(pdigit) AliZDCDigit(sector, digi); treeD->Fill(); // // --- Adding digits for 2nd ZDC set (left side w.r.t. IP) --- @@ -225,18 +255,53 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/) if(sector[0]==1 || sector[0]==2){ sectorL[0] = sector[0]+3; sectorL[1] = sector[1]; - for (Int_t res=0; res<2; res++){ + for(Int_t res=0; res<2; res++){ digiL[res] = Phe2ADCch(sectorL[0], sectorL[1], pm[sector[0]-1][sector[1]], res) + Pedestal(sectorL[0], sectorL[1], res); } - //printf("\t DIGIT added -> det = %d, quad = %d - digi[0,1] = [%d, %d]\n", - // sectorL[0], sectorL[1], digiL[0], digiL[1]); // Chiara debugging! - new(pdigit) AliZDCDigit(sectorL, digiL); + /*printf("\t DIGIT added -> det = %d, quad = %d - digi[0,1] = [%d, %d]\n", + sectorL[0], sectorL[1], digiL[0], digiL[1]); // Chiara debugging! + */ + // + new(pdigit) AliZDCDigit(sectorL, digiL); + treeD->Fill(); } // + //printf("\t AliZDCDigitizer -> TreeD has %d entries\n",(Int_t) treeD->GetEntries()); + } + } + // + // --- Adding digits for out-of-time channels after signal digits + for(sector[0]=1; sector[0]<=3; sector[0]++){ + for(sector[1]=0; sector[1]<5; sector[1]++){ + if((sector[0]==3) && ((sector[1]<1) || (sector[1]>2))) continue; + for(Int_t res=0; res<2; res++){ + digioot[res] = Pedestal(sector[0], sector[1], res); // out-of-time ADCs + } + /*printf("\t DIGIToot added -> det = %d, quad = %d - digi[0,1] = [%d, %d]\n", + sector[0], sector[1], digioot[0], digioot[1]); // Chiara debugging! + */ + // + new(pdigit) AliZDCDigit(sector, digioot); treeD->Fill(); + // + if(sector[0]==1 || sector[0]==2){ + sectorL[0] = sector[0]+3; + sectorL[1] = sector[1]; + for(Int_t res=0; res<2; res++){ + digioot[res] = Pedestal(sectorL[0], sectorL[1], res); // out-of-time ADCs + } + /*printf("\t DIGIToot added -> det = %d, quad = %d - digi[0,1] = [%d, %d]\n", + sectorL[0], sectorL[1], digioot[0], digioot[1]); // Chiara debugging! + */ + // + new(pdigit) AliZDCDigit(sectorL, digioot); + treeD->Fill(); + } + // + //printf("\t AliZDCDigitizer -> TreeD has %d entries\n",(Int_t) treeD->GetEntries()); } - + } // write the output tree loader->WriteDigits("OVERWRITE"); loader->UnloadDigits(); @@ -251,7 +316,7 @@ void AliZDCDigitizer::Fragmentation(Float_t impPar, Int_t specN, Int_t specP, Int_t zz[100], nn[100]; AliZDCFragment frag(impPar); - for (Int_t j=0; j<=99; j++){ + for(Int_t j=0; j<=99; j++){ zz[j] =0; nn[j] =0; } @@ -266,6 +331,10 @@ void AliZDCDigitizer::Fragmentation(Float_t impPar, Int_t specN, Int_t specP, frag.AttachNeutrons(zz, nn, ztot, ntot); freeSpecN = specN-ntot-2*nAlpha; freeSpecP = specP-ztot-2*nAlpha; + // Removing deuterons + Int_t ndeu = (Int_t) (frag.DeuteronNumber()); + freeSpecN -= ndeu; + // if(freeSpecN<0) freeSpecN=0; if(freeSpecP<0) freeSpecP=0; AliDebug(2, Form("FreeSpn = %d, FreeSpp = %d", freeSpecN, freeSpecP)); @@ -278,12 +347,12 @@ void AliZDCDigitizer::SpectatorSignal(Int_t SpecType, Int_t numEvents, // add signal of the spectators TFile* file = NULL; - if (SpecType == 1) { // --- Signal for spectator neutrons - file = TFile::Open("$ALICE/$ALICE_LEVEL/ZDC/ZNsignalntu.root"); - } else if (SpecType == 2) { // --- Signal for spectator protons - file = TFile::Open("$ALICE/$ALICE_LEVEL/ZDC/ZPsignalntu.root"); + if(SpecType == 1) { // --- Signal for spectator neutrons + file = TFile::Open("$ALICE_ROOT/ZDC/ZNsignalntu.root"); + } else if(SpecType == 2) { // --- Signal for spectator protons + file = TFile::Open("$ALICE_ROOT/ZDC/ZPsignalntu.root"); } - if (!file || !file->IsOpen()) { + if(!file || !file->IsOpen()) { AliError("Opening of file failed"); return; } @@ -294,7 +363,7 @@ void AliZDCDigitizer::SpectatorSignal(Int_t SpecType, Int_t numEvents, Float_t *entry, hitsSpec[7]; Int_t pl, i, j, k, iev=0, rnd[125], volume[2]; for(pl=0;pl<125;pl++) rnd[pl] = 0; - if (numEvents > 125) { + if(numEvents > 125) { AliWarning(Form("numEvents (%d) is larger than 125", numEvents)); numEvents = 125; } @@ -319,14 +388,14 @@ void AliZDCDigitizer::SpectatorSignal(Int_t SpecType, Int_t numEvents, volume[0], volume[1], lightQ, lightC)); //printf("\n Volume = (%d, %d), lightQ = %.0f, lightC = %.0f", // volume[0], volume[1], lightQ, lightC); - if (volume[0] < 3) { // ZN or ZP + if(volume[0] < 3) { // ZN or ZP pm[volume[0]-1][0] += lightC; pm[volume[0]-1][volume[1]] += lightQ; //printf("\n pm[%d][0] = %.0f, pm[%d][%d] = %.0f\n",(volume[0]-1),pm[volume[0]-1][0], // (volume[0]-1),volume[1],pm[volume[0]-1][volume[1]]); } else { - if (volume[1] == 1) pm[2][1] += lightC; // ZEM 1 + if(volume[1] == 1) pm[2][1] += lightC; // ZEM 1 else pm[2][2] += lightQ; // ZEM 2 //printf("\n pm[2][1] = %.0f, pm[2][2] = %.0f\n",pm[2][1],pm[2][2]); } @@ -359,19 +428,29 @@ Int_t AliZDCDigitizer::Pedestal(Int_t Det, Int_t Quad, Int_t Res) const { // Returns a pedestal for detector det, PM quad, channel with res. // - Float_t meanPed; - if(Det != 3) meanPed = fCalibData->GetMeanPed(10*(Det-1)+Quad+5*Res); - else meanPed = fCalibData->GetMeanPed(10*(Det-1)+Quad+1*Res); + Float_t PedValue; - //printf("\t Pedestal -> det = %d, quad = %d, res = %d - Ped[%d] = %d\n", - // Det, Quad, Res,10*(Det-1)+Quad+5*Res,(Int_t) meanPed); // Chiara debugging! + // Normal run + if(fIsCalibration == 0){ + Float_t meanPed, Pedwidth; + Int_t index=0; + if(Det==1|| Det==2) index = 10*(Det-1)+Quad+5*Res; // ZN1, ZP1 + else if(Det==3) index = 10*(Det-1)+(Quad-1)+Res; // ZEM + else if(Det==4|| Det==5) index = 10*(Det-2)+Quad+5*Res+4; // ZN2, ZP2 + meanPed = fCalibData->GetMeanPed(index); + Pedwidth = fCalibData->GetMeanPedWidth(index); + PedValue = gRandom->Gaus(meanPed,Pedwidth); + // + /*printf("\t Pedestal -> det = %d, quad = %d, res = %d - Ped[%d] = %d\n", + Det, Quad, index,(Int_t) PedValue); // Chiara debugging! + */ + } // To create calibration object - /*Float_t meanPed; - meanPed = gRandom->Gaus((40.+10.*gRandom->Rndm()),5.); - */ + else PedValue = gRandom->Gaus((40.+10.*gRandom->Rndm()),5.); + - return (Int_t) meanPed; + return (Int_t) PedValue; } //_____________________________________________________________________________ @@ -402,12 +481,15 @@ AliCDBStorage* AliZDCDigitizer::SetStorage(const char *uri) //_____________________________________________________________________________ AliZDCCalibData* AliZDCDigitizer::GetCalibData() const { - // returns pointer to AliZDCCalibData object - // - AliCDBEntry *entry = fStorage->Get("ZDC/Calib/Data",0); - AliZDCCalibData *calibdata = (AliZDCCalibData*) entry->GetObject(); - - if (!calibdata) AliWarning("No ZDC calibration data from calibration database!"); + + // Getting calibration object for ZDC set + + AliCDBEntry *entry = AliCDBManager::Instance()->Get("ZDC/Calib/Data"); + if(!entry) AliFatal("No calibration data loaded!"); + + AliZDCCalibData *calibdata = dynamic_cast (entry->GetObject()); + if(!calibdata) AliFatal("Wrong calibration object in calibration file!"); return calibdata; } +