Added function to make relative calibration objects

diff --git a/EMCAL/AliEMCALCalibData.cxx b/EMCAL/AliEMCALCalibData.cxx
index 453c0f0a5fc4e82119f52726842c868c26eccc3c..17f795eecb25dd31bcd66234d79d861e5028fd64 100644 (file)
--- a/EMCAL/AliEMCALCalibData.cxx
+++ b/EMCAL/AliEMCALCalibData.cxx
@@ -117,20 +117,21 @@ void AliEMCALCalibData::Reset()
   // Set all pedestals to 0 and all ADC channels widths to 1
   //memset(fADCchannel ,1,12*48*24*sizeof(Float_t));
   //memset(fADCpedestal,0,12*48*24*sizeof(Float_t));
-       Int_t nSMod = AliEMCALGeoParams::fgkEMCALModules; //12
-       Int_t nCol  = AliEMCALGeoParams::fgkEMCALCols;    //48
-       Int_t nRow  = AliEMCALGeoParams::fgkEMCALRows;    //24
-       Int_t nRow2 = AliEMCALGeoParams::fgkEMCALRows/2;  //12 - Modules 11 and 12 are half modules
-       for (Int_t supermodule=0; supermodule<nSMod; supermodule++){
-                if(supermodule >= 10)
-                       nRow = nRow2;
-                for (Int_t column=0; column<nCol; column++){
-                               for (Int_t row=0; row<nRow; row++){
-                                         fADCpedestal[supermodule][column][row]=0.;
-                                         fADCchannel [supermodule][column][row]=1.;
-                               }
-               }
-       } 
+
+  Int_t nSMod = AliEMCALGeoParams::fgkEMCALModules; //12
+  Int_t nCol  = AliEMCALGeoParams::fgkEMCALCols;    //48
+  Int_t nRow  = AliEMCALGeoParams::fgkEMCALRows;    //24
+  Int_t nRow2 = AliEMCALGeoParams::fgkEMCALRows/2;  //12 - Modules 11 and 12 are half modules
+  for (Int_t supermodule=0; supermodule<nSMod; supermodule++){
+    if(supermodule >= 10)
+      nRow = nRow2;
+    for (Int_t column=0; column<nCol; column++){
+      for (Int_t row=0; row<nRow; row++){
+        fADCpedestal[supermodule][column][row]=0.;
+        fADCchannel [supermodule][column][row]=1.;
+      }
+    }
+  } 
 }
 
 //________________________________________________________________
@@ -205,3 +206,34 @@ void AliEMCALCalibData::SetADCpedestal(Int_t supermodule, Int_t column, Int_t ro
   // Set ADC pedestal values
   fADCpedestal[supermodule][column][row] = value;
 }
+
+//________________________________________________________________
+void AliEMCALCalibData::Fill(const AliEMCALCalibData *cd1, const AliEMCALCalibData *cd2, Bool_t print)
+{
+  // Fill for (relative) recalibration to undo calibration 
+  // from 1 and apply calibration from 2.
+
+  Int_t nSMod = AliEMCALGeoParams::fgkEMCALModules; //12
+  Int_t nCol  = AliEMCALGeoParams::fgkEMCALCols;    //48
+  Int_t nRow  = AliEMCALGeoParams::fgkEMCALRows;    //24
+  Int_t nRow2 = AliEMCALGeoParams::fgkEMCALRows/2;  //12 - Modules 11 and 12 are half modules
+  for (Int_t supermodule=0; supermodule<nSMod; supermodule++) {
+    if(supermodule >= 10)
+      nRow = nRow2;
+    for (Int_t column=0; column<nCol; column++) {
+      for (Int_t row=0; row<nRow; row++){
+        Double_t adc1 = cd1->GetADCchannel(supermodule, column, row);
+        Double_t ped1 = cd1->GetADCpedestal(supermodule, column, row);
+        Double_t adc2 = cd2->GetADCchannel(supermodule, column, row);
+        Double_t ped2 = cd2->GetADCpedestal(supermodule, column, row);
+        Double_t adc = adc2/adc1;
+        Double_t ped = ped2-adc*ped1;
+        if (print)
+          printf("%d %d %d: %f %f %f %f -> %f %f\n",supermodule,column,row,adc1,ped1,adc2,ped2,adc,ped);
+        fADCchannel [supermodule][column][row]=adc;
+        fADCpedestal[supermodule][column][row]=ped;
+      }
+    }
+  } 
+}
+

diff --git a/EMCAL/AliEMCALCalibData.h b/EMCAL/AliEMCALCalibData.h
index 8055c08eec83b927d7d2f2c123e9062560cc9c65..1bbb45034014388b9d5e7b07b9ce03e222d5c5a9 100644 (file)
--- a/EMCAL/AliEMCALCalibData.h
+++ b/EMCAL/AliEMCALCalibData.h
@@ -29,6 +29,8 @@ class AliEMCALCalibData: public TNamed {
   //
   void SetADCchannel(Int_t module, Int_t column, Int_t row, Float_t value);
   void SetADCpedestal(Int_t module, Int_t column, Int_t row, Float_t value);
+  // Fill for (relative) recalibration (undo 1, apply 2)
+  void Fill(const AliEMCALCalibData *cd1, const AliEMCALCalibData *cd2, Bool_t print=0);
 
  protected:
   Float_t  fADCchannel [AliEMCALGeoParams::fgkEMCALModules][AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows] ; // width of one ADC channel in GeV ([mod][col][row])