From: kharlov Date: Sun, 15 Feb 2015 19:33:59 +0000 (+0300) Subject: CPV DA updates (S.Evdokimov) X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=bdffcb756df504dedaeeeaaddae033af3287b2b1;hp=522e7670998303ed7f63d73714624578d6fde12a CPV DA updates (S.Evdokimov) --- diff --git a/PHOS/DA/CMakeLists.txt b/PHOS/DA/CMakeLists.txt index 4469a37644a..e29e64123ce 100644 --- a/PHOS/DA/CMakeLists.txt +++ b/PHOS/DA/CMakeLists.txt @@ -42,3 +42,6 @@ generateDA("PHOS" "PED" "${STATIC_DEPENDENCIES}") set(STATIC_DEPENDENCIES PHOSbase-static RAWDatabase-static RAWDatarec-static STEERBase-static) generateDA("PHOS" "CPVPED" "${STATIC_DEPENDENCIES}") + +set(STATIC_DEPENDENCIES PHOSbase-static RAWDatabase-static RAWDatarec-static STEERBase-static) +generateDA("PHOS" "CPVBCM" "${STATIC_DEPENDENCIES}") diff --git a/PHOS/DA/PHOSCPVPEDda.cxx b/PHOS/DA/PHOSCPVPEDda.cxx index 1dc2d57d5f9..451be9fd70c 100644 --- a/PHOS/DA/PHOSCPVPEDda.cxx +++ b/PHOS/DA/PHOSCPVPEDda.cxx @@ -11,11 +11,11 @@ Input files: raw data file Output files: thr?_??.dat CpvPeds.root Trigger types used: PHYSICS_EVENT */ - +//daqDA #include "event.h" #include "monitor.h" #include "daqDA.h" - +//system #include #include #include @@ -27,14 +27,13 @@ Trigger types used: PHYSICS_EVENT #include "AliPHOSCpvParam.h" #include "AliRawReaderDate.h" #include "AliBitPacking.h" -#include "TMath.h" //ROOT #include "TROOT.h" #include "TPluginManager.h" #include "TSAXParser.h" #include "TTree.h" - +#include "TMath.h" #include "TString.h" #include "TFile.h" #include "TSystem.h" @@ -64,7 +63,7 @@ int main( int argc, char **argv ) } // log start of process - printf("Cpv DA program started\n"); + printf("Cpv pedestal DA program started\n"); /* report progress */ daqDA_progressReport(0); @@ -146,26 +145,28 @@ int main( int argc, char **argv ) Printf(" Received %d events, %d good events",iTotEvnt,iPhysEvnt); /* report progress */ - daqDA_progressReport(80); + daqDA_progressReport(95); - for(int iDDL = 0; iDDL CalcPedestal(iDDL)){ pedProducer -> WritePedFiles(iDDL); - //for (int iCC = 0; iCCWriteAllHistsToFile("CpvPeds.root"); status = daqDA_DB_storeFile("CpvPeds.root","CpvPeds.root"); if(status) printf("Failed to store CpvPeds.root in DAQ DB!\n"); + status = daqDA_FES_storeFile("CpvPeds.root","CpvPeds.root"); + if(status) printf("Failed to store CpvPeds.root in DAQ FXS!\n"); /* report progress */ - daqDA_progressReport(95); + daqDA_progressReport(100); return status; diff --git a/PHOS/PHOSbase/AliPHOSCpvPedProducer.cxx b/PHOS/PHOSbase/AliPHOSCpvPedProducer.cxx index 9f9d1e43c19..5a8facd8472 100644 --- a/PHOS/PHOSbase/AliPHOSCpvPedProducer.cxx +++ b/PHOS/PHOSbase/AliPHOSCpvPedProducer.cxx @@ -29,6 +29,16 @@ AliPHOSCpvPedProducer::AliPHOSCpvPedProducer(Int_t sigcut): // //constructor // + for(Int_t iDDL=0; iDDL<2*AliPHOSCpvParam::kNDDL; iDDL++) {//iDDL + fPedMeanMap[iDDL]=0; + fPedSigMap [iDDL]=0; + f1DPedMean [iDDL]=0; + f1DPedSigma[iDDL]=0; + for(Int_t iX=0; iX Fill(q); return kTRUE; } @@ -137,7 +147,7 @@ void AliPHOSCpvPedProducer::WriteAllHistsToFile(const char * name) const TFile * rootF = TFile::Open(name,"RECREATE"); printf("Root file created \n"); //rootF->cd(); - for(Int_t iDDL=0; iDDLWrite(); @@ -156,7 +166,7 @@ void AliPHOSCpvPedProducer::WriteAllHistsToFile(const char * name) const } //if(fhErrors) fhErrors -> Write(); - for(Int_t iDDL=0; iDDLWrite(); diff --git a/PHOS/PHOSbase/AliPHOSCpvPedProducer.h b/PHOS/PHOSbase/AliPHOSCpvPedProducer.h index 74c6ee28e1e..c286bb116fb 100644 --- a/PHOS/PHOSbase/AliPHOSCpvPedProducer.h +++ b/PHOS/PHOSbase/AliPHOSCpvPedProducer.h @@ -47,15 +47,16 @@ protected: void CreateErrHist(); // initialize histogram of errors void CreateDDLHistos(Int_t iDDL); // initialize histograms for pedestal calculation and representation - TH1F *fPadAdc[AliPHOSCpvParam::kNDDL][AliPHOSCpvParam::kPadPcX][AliPHOSCpvParam::kPadPcY]; //Charge distribution for pads + //our ddls are 0,2,4,6,8 + TH1F *fPadAdc[2*AliPHOSCpvParam::kNDDL][AliPHOSCpvParam::kPadPcX][AliPHOSCpvParam::kPadPcY]; //Charge distribution for pads Int_t fSigCut; //n. of pedestal distribution sigmas used to create zero suppresion table static const Int_t fMaxThr = 511; //maximal threshold (9 bits all with 1) Bool_t fTurbo; // if true, then read without error checking - - TH2F *fPedMeanMap[AliPHOSCpvParam::kNDDL]; //2D mean pedestal map to export to AMORE - TH2F *fPedSigMap [AliPHOSCpvParam::kNDDL]; //2D pedestal sigma map to export to AMORE - TH1F *f1DPedMean [AliPHOSCpvParam::kNDDL]; //1D mean pedestal map to export to AMORE - TH1F *f1DPedSigma[AliPHOSCpvParam::kNDDL]; //1D pedestal sigma map to export to AMORE + //our ddls are 0,2,4,6,8 + TH2F *fPedMeanMap[2*AliPHOSCpvParam::kNDDL]; //2D mean pedestal map to export to AMORE + TH2F *fPedSigMap [2*AliPHOSCpvParam::kNDDL]; //2D pedestal sigma map to export to AMORE + TH1F *f1DPedMean [2*AliPHOSCpvParam::kNDDL]; //1D mean pedestal map to export to AMORE + TH1F *f1DPedSigma[2*AliPHOSCpvParam::kNDDL]; //1D pedestal sigma map to export to AMORE TH1I *fhErrors; //histogram of errors from AliPHOSCpvRawDigiProducer AliPHOSCpvRawStream * fRawStream; //! Raw data stream private: diff --git a/PHOS/PHOSbase/AliPHOSCpvRawDigiProducer.cxx b/PHOS/PHOSbase/AliPHOSCpvRawDigiProducer.cxx index 8753e1779a1..593b9f8d37f 100644 --- a/PHOS/PHOSbase/AliPHOSCpvRawDigiProducer.cxx +++ b/PHOS/PHOSbase/AliPHOSCpvRawDigiProducer.cxx @@ -42,7 +42,7 @@ AliPHOSCpvRawDigiProducer::AliPHOSCpvRawDigiProducer(): CreateErrHist(); // create a 2d array to store the pedestals - for (Int_t iDDL=0;iDDLSetTurbo(fTurbo); CreateErrHist(); // create a 2d array to store the pedestals - for (Int_t iDDL=0;iDDLRelToAbsNumbering(relId, absId); @@ -205,7 +205,7 @@ void AliPHOSCpvRawDigiProducer::MakeDigits(TClonesArray * digits) const AliDebug(1,Form("Array of %d CPV digits is created",digits->GetEntriesFast())); // fill histogram of errors - for(Int_t iDDL=0; iDDL Fill(iType+1,fRawStream -> GetErrors(iDDL,iType)); diff --git a/PHOS/PHOSbase/AliPHOSCpvRawDigiProducer.h b/PHOS/PHOSbase/AliPHOSCpvRawDigiProducer.h index 7438c486173..c275dcf4deb 100644 --- a/PHOS/PHOSbase/AliPHOSCpvRawDigiProducer.h +++ b/PHOS/PHOSbase/AliPHOSCpvRawDigiProducer.h @@ -51,7 +51,7 @@ private: TH1I * fhErrors; // ! histogram of errors - Int_t ** fPed[2][AliPHOSCpvParam::kNDDL]; // pedestals ped[0][iddl][x][y] = pedestal; ped[1][iddl][x][y] = N*sigma (N was used while creating ped files) + Int_t ** fPed[2][2*AliPHOSCpvParam::kNDDL]; // pedestals ped[0][iddl][x][y] = pedestal; ped[1][iddl][x][y] = N*sigma (N was used while creating ped files) Bool_t fPedFilesRLoaded; ClassDef(AliPHOSCpvRawDigiProducer,2);