CPV DA updates (S.Evdokimov)

diff --git a/PHOS/DA/CMakeLists.txt b/PHOS/DA/CMakeLists.txt
index 4469a37644addbe0d4c92fb3304cb347c5471990..e29e64123ce469f938b0a6184728a379cd9f5521 100644 (file)
--- 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 1dc2d57d5f9f73d294007698148db78ffbd4443c..451be9fd70c6af6c4066d1d2790331c3a4f872e2 100644 (file)
--- 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 <Riostream.h>
 #include <stdlib.h>
 #include <fstream>
@@ -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<AliPHOSCpvParam::kNDDL; iDDL++){
+  for(int iDDL = 0; iDDL<2*AliPHOSCpvParam::kNDDL; iDDL++){
     if(pedProducer -> CalcPedestal(iDDL)){
       pedProducer -> WritePedFiles(iDDL);
-      //for (int iCC = 0; iCC<AliPHOSCpvParam::kNRows){
-      //       status=daqDA_DB_storeFile(Form("thr%d_%02d.dat", iDDL, iCC));
-      //       if(status) printf("Failed to store thr%d_%02d.dat in DAQ DB!\n",iDDL, iCC);
-      //       status=daqDA_FES_storeFile(Form("thr%d_%02d.dat", iDDL, iCC));
-      //       if(status) printf("Failed to export thr%d_%02d.dat to DAQ FES!\n",iDDL, iCC);
-      //}
+      for (int iCC = 0; iCC<AliPHOSCpvParam::kNRows; iCC++){
+       status=daqDA_DB_storeFile(Form("thr%d_%02d.dat", iDDL, iCC),Form("thr%d_%02d.dat", iDDL, iCC));
+       if(status) printf("Failed to store thr%d_%02d.dat in DAQ DB!\n",iDDL, iCC);
+       //status=daqDA_FES_storeFile(Form("thr%d_%02d.dat", iDDL, iCC));
+       //if(status) printf("Failed to export thr%d_%02d.dat to DAQ FES!\n",iDDL, iCC);
+      }
     }
   }
 
   pedProducer->WriteAllHistsToFile("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 9f9d1e43c1925b74c77ae0b4bceb7f09eaa451c2..5a8facd84725a2fb3c7d817bb50783c008a7f974 100644 (file)
--- 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<AliPHOSCpvParam::kPadPcX; iX++)
+      for(Int_t iY=1; iY<AliPHOSCpvParam::kPadPcY; iY++)
+       fPadAdc[iDDL][iX][iY]=0;
+  }//iDDL
+
   CreateErrHist();
 }  //constructor
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -37,7 +47,7 @@ AliPHOSCpvPedProducer::~AliPHOSCpvPedProducer()
   //
   //destructor
   //
-  for(Int_t iDDL=0; iDDL<AliPHOSCpvParam::kNDDL; iDDL++) {//iDDL
+  for(Int_t iDDL=0; iDDL<2*AliPHOSCpvParam::kNDDL; iDDL++) {//iDDL
     delete fPedMeanMap[iDDL];
     delete fPedSigMap [iDDL];
     delete f1DPedMean [iDDL];
@@ -82,7 +92,7 @@ Bool_t AliPHOSCpvPedProducer::FillPedestal(Int_t abspad,Float_t q)
     Int_t iDDL=AliPHOSCpvParam::A2DDL(abspad),
             iX=AliPHOSCpvParam::A2X(abspad),
             iY=AliPHOSCpvParam::A2Y(abspad);
-    if(!fPedMeanMap[iDDL]) CreateDDLHistos(iDDL);
+    if(!fPadAdc [iDDL][iX][iY]) CreateDDLHistos(iDDL); 
     fPadAdc [iDDL][iX][iY] -> 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; iDDL<AliPHOSCpvParam::kNDDL; iDDL++) {
+  for(Int_t iDDL=0; iDDL<2*AliPHOSCpvParam::kNDDL; iDDL++) {
     // for(Int_t iX=0; iX<AliPHOSCpvParam::kPadPcX; iX++) {
     //   for(Int_t iY=0; iY<AliPHOSCpvParam::kPadPcY; iY++) {
     //         //fPadAdc[iDDL][iX][iY]->Write();
@@ -156,7 +166,7 @@ void AliPHOSCpvPedProducer::WriteAllHistsToFile(const char * name) const
   }
   //if(fhErrors) fhErrors -> Write();
 
-  for(Int_t iDDL=0; iDDL<AliPHOSCpvParam::kNDDL; iDDL++)
+  for(Int_t iDDL=0; iDDL<2*AliPHOSCpvParam::kNDDL; iDDL++)
     for(Int_t iX=0; iX<AliPHOSCpvParam::kPadPcX; iX++)
       for(Int_t iY=0; iY<AliPHOSCpvParam::kPadPcY; iY++);
   //fPadAdc[iDDL][iX][iY]->Write();

diff --git a/PHOS/PHOSbase/AliPHOSCpvPedProducer.h b/PHOS/PHOSbase/AliPHOSCpvPedProducer.h
index 74c6ee28e1e46481788ef40fb8cf0480aba85b3c..c286bb116fb6e744f1ebe25fffe1418b9545b3ed 100644 (file)
--- 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 8753e1779a1c5c70c60f88a0cc1602c5d9428cf2..593b9f8d37f1cac487c4e8be5ba4048449ad0a81 100644 (file)
--- 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;iDDL<AliPHOSCpvParam::kNDDL;iDDL++){
+  for (Int_t iDDL=0;iDDL<2*AliPHOSCpvParam::kNDDL;iDDL++){
     fPed[0][iDDL] = new Int_t *[AliPHOSCpvParam::kPadPcX];
     fPed[1][iDDL] = new Int_t *[AliPHOSCpvParam::kPadPcX];
     for(Int_t ix=0; ix<AliPHOSCpvParam::kPadPcX; ix++) {
@@ -68,7 +68,7 @@ AliPHOSCpvRawDigiProducer::AliPHOSCpvRawDigiProducer(AliRawReader * rawReader):
   fRawStream->SetTurbo(fTurbo);
   CreateErrHist();
   // create a 2d array to store the pedestals                                               
-  for (Int_t iDDL=0;iDDL<AliPHOSCpvParam::kNDDL;iDDL++) {
+  for (Int_t iDDL=0;iDDL<2*AliPHOSCpvParam::kNDDL;iDDL++) {
     fPed[0][iDDL] = new Int_t *[AliPHOSCpvParam::kPadPcX];
     fPed[1][iDDL] = new Int_t *[AliPHOSCpvParam::kPadPcX];
     for(Int_t ix=0; ix<AliPHOSCpvParam::kPadPcX; ix++) {
@@ -82,7 +82,7 @@ AliPHOSCpvRawDigiProducer::~AliPHOSCpvRawDigiProducer()
 {
   if(fRawStream) delete fRawStream;
   if(fhErrors) delete fhErrors; 
-  for(Int_t iDDL = 0;iDDL<AliPHOSCpvParam::kNDDL;iDDL++) {
+  for(Int_t iDDL = 0;iDDL<2*AliPHOSCpvParam::kNDDL;iDDL++) {
     for(Int_t ix=0; ix<AliPHOSCpvParam::kPadPcX; ix++) { 
       delete [] fPed[0][iDDL][ix];
       delete [] fPed[1][iDDL][ix];
@@ -94,7 +94,7 @@ AliPHOSCpvRawDigiProducer::~AliPHOSCpvRawDigiProducer()
 //--------------------------------------------------------------------------------------
 Bool_t AliPHOSCpvRawDigiProducer::LoadPedFiles() {
   // read pedestals from file                                             
-  for(Int_t iDDL = 0;iDDL<AliPHOSCpvParam::kNDDL;iDDL++)
+  for(Int_t iDDL = 0;iDDL<2*AliPHOSCpvParam::kNDDL;iDDL+=2)
     for(Int_t iCC=0; iCC<AliPHOSCpvParam::kNRows; iCC++) {
       FILE * pedFile;
       pedFile = fopen(Form("thr%d_%02d.dat",iDDL,iCC),"r");
@@ -177,7 +177,7 @@ void AliPHOSCpvRawDigiProducer::MakeDigits(TClonesArray * digits) const
       Int_t iddl     = AliPHOSCpvParam::A2DDL(aPad);
 
       relId[0] = AliPHOSCpvParam::DDL2Mod(iddl) ; // counts from 1 to 5
-      relId[1] = 1;      // 1=CPV
+      relId[1] = -1;      // -1=CPV
       relId[2] = ix + 1; // counts from 1 to 128
       relId[3] = iy + 1; // counts from 1 to 60
       fGeom->RelToAbsNumbering(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<AliPHOSCpvParam::kNDDL; iDDL++) {
+  for(Int_t iDDL=0; iDDL<2*AliPHOSCpvParam::kNDDL; iDDL++) {
     Int_t nErrors = AliPHOSCpvRawStream::GetNErrors();
     for(Int_t iType=0; iType<nErrors; iType++) { // iType - type of error
       fhErrors -> Fill(iType+1,fRawStream -> GetErrors(iDDL,iType));

diff --git a/PHOS/PHOSbase/AliPHOSCpvRawDigiProducer.h b/PHOS/PHOSbase/AliPHOSCpvRawDigiProducer.h
index 7438c486173983389157531f2c1a0d474b92d56f..c275dcf4debb792e5961f519cee085a6147784c2 100644 (file)
--- 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);