eclMergingCrystalTimingAlgorithm.cc

/**************************************************************************
 * basf2 (Belle II Analysis Software Framework)                           *
 * Author: The Belle II Collaboration                                     *
 *                                                                        *
 * See git log for contributors and copyright holders.                    *
 * This file is licensed under LGPL-3.0, see LICENSE.md.                  *
 **************************************************************************/
 
/* Own header. */
#include <ecl/calibration/eclMergingCrystalTimingAlgorithm.h>
 
/* ECL headers. */
#include <ecl/dbobjects/ECLCrystalCalib.h>
#include <ecl/dbobjects/ECLReferenceCrystalPerCrateCalib.h>
#include <ecl/digitization/EclConfiguration.h>
#include <ecl/mapper/ECLChannelMapper.h>
 
/* ROOT headers. */
#include <TDirectory.h>
#include <TFile.h>
#include <TH1F.h>
#include <TString.h>
 
using namespace std;
using namespace Belle2;
using namespace ECL;
using namespace Calibration;
 
eclMergingCrystalTimingAlgorithm::eclMergingCrystalTimingAlgorithm():
  CalibrationAlgorithm("DummyCollector"),
  readPrevCrysPayload(false),
  m_ECLCrystalTimeOffsetBhabha("ECLCrystalTimeOffsetBhabha"),
  m_ECLCrystalTimeOffsetBhabhaGamma("ECLCrystalTimeOffsetBhabhaGamma"),
  m_ECLCrystalTimeOffsetCosmic("ECLCrystalTimeOffsetCosmic"),
  m_ECLReferenceCrystalPerCrateCalib("ECLReferenceCrystalPerCrateCalib"),
  m_ECLCrateTimeOffset("ECLCrateTimeOffset")
{
  setDescription(
    "Perform time calibration of ecl crystals by combining previous values from the DB for different calibrations."
  );
}
 
CalibrationAlgorithm::EResult eclMergingCrystalTimingAlgorithm::calibrate()
{
  B2INFO("readPrevCrysPayload = " << readPrevCrysPayload);
 
  //------------------------------------------------------------------------
  // Get the input run list to use to update the DBObjectPtrs
  auto runs = getRunList();
  /* Take the first run.  For the crystal cosmic calibrations, because of the crate
     calibrations, there is not a known correct run to use within the range. */
  ExpRun chosenRun = runs.front();
  B2INFO("merging using the ExpRun (" << chosenRun.second << "," << chosenRun.first << ")");
  // After here your DBObjPtrs are correct
  updateDBObjPtrs(1, chosenRun.second, chosenRun.first);
 
 
  //------------------------------------------------------------------------
  /* With the database set up, load the ecl channel mapper to access the
     crystal to crate mapping information */
  unique_ptr<ECLChannelMapper> crystalMapper(new ECL::ECLChannelMapper());
  crystalMapper->initFromDB();
 
  //------------------------------------------------------------------------
  // Test the DBObjects we want to exist and fail if not all of them do.
  bool allObjectsFound = true;
 
  // Check that the payloads we want to merge are sufficiently loaded
  if (!m_ECLCrystalTimeOffsetBhabha) {
    allObjectsFound = false;
    B2ERROR("No valid DBObject found for 'ECLCrystalTimeOffsetBhabha'");
  }
  if (!m_ECLCrystalTimeOffsetBhabhaGamma) {
    allObjectsFound = false;
    B2ERROR("No valid DBObject found for 'ECLCrystalTimeOffsetBhabhaGamma'");
  }
  if (!m_ECLCrystalTimeOffsetCosmic) {
    allObjectsFound = false;
    B2ERROR("No valid DBObject found for 'ECLCrystalTimeOffsetCosmic'");
  }
 
  // Check that the reference crystal payload is loaded
  if (!m_ECLReferenceCrystalPerCrateCalib) {
    allObjectsFound = false;
    B2ERROR("No valid DBObject found for 'ECLReferenceCrystalPerCrateCalib'");
  }
 
  // Check that the crate payload is loaded (used for transforming cosmic payload)
  if (!m_ECLCrateTimeOffset) {
    allObjectsFound = false;
    B2ERROR("No valid DBObject found for 'ECLCrateTimeOffset'");
  }
 
 
  if (allObjectsFound) {
    B2INFO("Valid objects found for 'ECLCrystalTimeOffsetBhabha', 'ECLCrystalTimeOffsetBhabhaGamma' and 'ECLCrystalTimeOffsetCosmic')");
    B2INFO("Valid object found for 'ECLReferenceCrystalPerCrateCalib'");
    B2INFO("Valid object found for 'ECLCrateTimeOffset'");
  } else {
    B2INFO("Exiting with failure");
    return c_Failure;
  }
 
 
  /* 1/(4fRF) = 0.4913 ns/clock tick, where fRF is the accelerator RF frequency.
     Same for all crystals.  */
  const double TICKS_TO_NS = 1.0 / (4.0 * EclConfiguration::getRF()) * 1e3;
 
 
 
  // Set the rootfile name
  bool minRunNumBool = false;
  bool maxRunNumBool = false;
  int minRunNum = -1;
  int maxRunNum = -1;
  int minExpNum = -1;
  int maxExpNum = -1;
  for (auto expRun : getRunList()) {
    int expNumber = expRun.first;
    int runNumber = expRun.second;
    if (!minRunNumBool) {
      minExpNum = expNumber;
      minRunNum = runNumber;
      minRunNumBool = true;
    }
    if (!maxRunNumBool) {
      maxExpNum = expNumber;
      maxRunNum = runNumber;
      maxRunNumBool = true;
    }
    if (((minRunNum > runNumber)   && (minExpNum >= expNumber))  ||
        (minExpNum > expNumber)) {
      minExpNum = expNumber;
      minRunNum = runNumber;
    }
    if (((maxRunNum < runNumber)   && (maxExpNum <= expNumber))  ||
        (maxExpNum < expNumber))
 
    {
      maxExpNum = expNumber;
      maxRunNum = runNumber;
    }
  }
 
  string debugFilenameBase = "ECLCrystalTimeOffsetMerged";
  B2INFO("debugFilenameBase = " << debugFilenameBase);
  string runNumsString = string("_") + to_string(minExpNum) + "_" + to_string(minRunNum) + string("-") +
                         to_string(maxExpNum) + "_" + to_string(maxRunNum);
  string debugFilename = debugFilenameBase + runNumsString + string(".root");
 
 
 
 
  //------------------------------------------------------------------------
  vector<float> bhabhaCalib = m_ECLCrystalTimeOffsetBhabha->getCalibVector();
  vector<float> bhabhaCalibUnc = m_ECLCrystalTimeOffsetBhabha->getCalibUncVector();  // Negative uncertainties are flags of bad fits
 
  vector<float> bhabhaGammaCalib = m_ECLCrystalTimeOffsetBhabhaGamma->getCalibVector();
  vector<float> bhabhaGammaCalibUnc = m_ECLCrystalTimeOffsetBhabhaGamma->getCalibUncVector();  // Negative uncertainties can be flags
 
  vector<float> cosmicCalib = m_ECLCrystalTimeOffsetCosmic->getCalibVector();
  vector<float> cosmicCalibUnc = m_ECLCrystalTimeOffsetCosmic->getCalibUncVector();
 
  B2INFO("Loaded 'ECLCrystalTimeOffset*' calibrations");
 
  // Get the list of reference crystals as special case crystals
  vector<short> refCrystalPerCrate = m_ECLReferenceCrystalPerCrateCalib->getReferenceCrystals();
 
  B2INFO("Loaded 'ECLReferenceCrystalPerCrateCalib' calibration");
 
  vector<float> crateCalib = m_ECLCrateTimeOffset->getCalibVector();
 
  B2INFO("Loaded 'ECLCrateTimeOffset' calibration");
 
 
  // Get the previous crystal payloads
  DBObjPtr<Belle2::ECLCrystalCalib> customPrevCrystalTimeObject("ECLCrystalTimeOffsetPreviousValues");
  vector<float> prevValuesCrys(ECLElementNumbers::c_NCrystals);
  vector<float> prevValuesCrysUnc(ECLElementNumbers::c_NCrystals);
 
  DBObjPtr<Belle2::ECLCrystalCalib> customPrevBhabhaCrystalTimeObject("ECLCrystalTimeOffsetBhabhaPreviousValues");
  vector<float> prevBhabhaValuesCrys(ECLElementNumbers::c_NCrystals);
  vector<float> prevBhabhaValuesCrysUnc(ECLElementNumbers::c_NCrystals);
 
  if (readPrevCrysPayload) {
    //..Get vectors of values from the payloads
    prevValuesCrys = customPrevCrystalTimeObject->getCalibVector();
    prevValuesCrysUnc = customPrevCrystalTimeObject->getCalibUncVector();
 
    prevBhabhaValuesCrys = customPrevBhabhaCrystalTimeObject->getCalibVector();
    prevBhabhaValuesCrysUnc = customPrevBhabhaCrystalTimeObject->getCalibUncVector();
 
    //..Print out a few values for quality control
    B2INFO("Previous values read from database.  Write out for their values for comparison");
    for (int ic = 0; ic < ECLElementNumbers::c_NCrystals; ic += 500) {
      B2INFO("ts custom previous payload: cellID " << ic + 1 << " " << prevValuesCrys[ic]);
    }
    B2INFO("Previous bhabha values read from database.  Write out for their values for comparison");
    for (int ic = 0; ic < ECLElementNumbers::c_NCrystals; ic += 500) {
      B2INFO("ts custom previous bhabha payload: cellID " << ic + 1 << " " << prevBhabhaValuesCrys[ic]);
    }
  }
 
 
 
  //------------------------------------------------------------------------
  //------------------------------------------------------------------------
  /* Determine the bhabha and radiative bhabha calibration quality*/
 
  vector<bool> bhabhaCalibGoodQuality(m_numCrystals, false);
  vector<bool> bhabhaGammaCalibGoodQuality(m_numCrystals, false);
  for (int ic = 0; ic < m_numCrystals; ic++) {
    /* Define a good bhabha calibration value.  This is the
       uncertainty on the calibration constant (e.g. fit mean),
       not the gaussian width of the timing distribution for
       that crystal (i.e. resolution).
 
       Uncertainty stored as ticks so converted to ns for
       more human readable cut.*/
    if (bhabhaCalibUnc[ic] != 0
        && fabs(bhabhaCalibUnc[ic])*TICKS_TO_NS < 2) {
      // The limits on the uncertainties are not fully optimized !!!!!!!!!!!!!!!!!!!!!!!!!!
      // Tighten the uncertainty cut after introduction of bhabha gamma calibration.  Perhaps checking if the
      // value is negative as that flags poor fits / the overall hist mean was used.  In these cases,
      // the bhabha gamma calibration should be used (if it has good stats) but until that calibration is
      // properly made (not all zeros) then the bhabha calibration should be used instead as the only
      // other option is the cosmic calibration.
      bhabhaCalibGoodQuality[ic] = true ;
    }
    /* Define a good radiative bhabha calibration value, which
       should be looser than the bhabha requirements since
       the radiative bhabha calibration is the backup choice.
       If the radiative bhabha calibration is not good then
       we resort to using the cosmic calibration so the
       radiative bhabha requirements should be fairly loose.
 
       Uncertainty stored as ticks so converted to ns for
       more human readable cut.*/
    if (bhabhaGammaCalibUnc[ic] != 0
        && fabs(bhabhaGammaCalibUnc[ic])*TICKS_TO_NS <
        3.5) {     // The limits on the uncertainties are not fully optimized !!!!!!!!!!!!!!!!!!!!!!!!!!
      bhabhaGammaCalibGoodQuality[ic] = true ;
    }
  }
 
 
  /* Loop over all crystals and shift the cosmic crystal calibration by
     the crate calibration because the cosmic calibration was made
     assuming the crate calibration is 0.*/
 
  vector<float> crateCalibShort(m_numCrates);
  vector<float> cosmicCalibShifted = cosmicCalib;
  vector<float> cosmicCalibShiftedUnc = cosmicCalibUnc;  // Do not modify uncertainty?
  for (int ic = 0; ic < m_numCrystals; ic++) {
    cosmicCalibShifted[ic] -= crateCalib[ic];
    int crate_id_from_crystal = crystalMapper->getCrateID(ic + 1);
    crateCalibShort[crate_id_from_crystal - 1] = crateCalib[ic];
  }
 
  for (int icrate = 0; icrate < m_numCrates; icrate++) {
    B2INFO("crate time calibration for crate " <<
           icrate + 1 << " = " << crateCalibShort[icrate]);
  }
 
 
  /* Keep track of the mean value of the crystal calibration constants
     for each crate.  Exclude crystals with bad quality or that have
     a value of 0 (except reference crystals). */
  vector<float> meanGoodCrystalCalibPerCrate_bhabha(m_numCrates, 0);
  vector<float> meanGoodCrystalCalibPerCrate_cosmic(m_numCrates, 0);
 
  /* Start num entries at 1 because we will skip all 0s but include
     the reference crystal (ts=0) by just increasing the counter.
     We only need a counter for the bhabha events since we want to
     get the same sample of crystals for both the bhabha and cosmic
     calibrations.*/
  vector<short> numGoodCrystalCalibPerCrate_bhabha(m_numCrates, 1);
 
 
  /* Loop over all crystals and save the crystal calibration information
     for each crate. */
  for (int ic_base1 = 1; ic_base1 <= m_numCrystals; ic_base1++) {
    int crate_id_from_crystal = crystalMapper->getCrateID(ic_base1);
 
    if (!((bhabhaCalib[ic_base1 - 1] == 0) || (! bhabhaCalibGoodQuality[ic_base1 - 1]))) {
      meanGoodCrystalCalibPerCrate_bhabha[crate_id_from_crystal - 1] += bhabhaCalib[ic_base1 - 1];
      meanGoodCrystalCalibPerCrate_cosmic[crate_id_from_crystal - 1] += cosmicCalibShifted[ic_base1 - 1];
      numGoodCrystalCalibPerCrate_bhabha[crate_id_from_crystal - 1]++ ;
    }
  }
 
  /* Complete the calculation of the mean by dividing the sum by the number of entries */
  for (int icrate = 0; icrate < m_numCrates; icrate++) {
    meanGoodCrystalCalibPerCrate_bhabha[icrate] /= numGoodCrystalCalibPerCrate_bhabha[icrate] ;
    meanGoodCrystalCalibPerCrate_cosmic[icrate] /= numGoodCrystalCalibPerCrate_bhabha[icrate] ;
    B2INFO("Mean bhabha crystal calibration for crate " << icrate + 1 << " = " << meanGoodCrystalCalibPerCrate_bhabha[icrate]);
    B2INFO("Mean cosmic crystal calibration for crate " << icrate + 1 << " = " << meanGoodCrystalCalibPerCrate_cosmic[icrate]);
    B2INFO("Number of good crystal calibrations for crate" << icrate + 1 << " = " << numGoodCrystalCalibPerCrate_bhabha[icrate]);
  }
 
 
  /* Loop over all crystals and correct the cosmic calibration by the cosmic calibration
     for each crate by the average difference to the bhabha calibration. */
  for (int ic_base1 = 1; ic_base1 <= m_numCrystals; ic_base1++) {
    int crate_id_from_crystal = crystalMapper->getCrateID(ic_base1);
    cosmicCalibShifted[ic_base1 - 1] += meanGoodCrystalCalibPerCrate_bhabha[crate_id_from_crystal - 1] -
                                        meanGoodCrystalCalibPerCrate_cosmic[crate_id_from_crystal - 1] ;
  }
 
 
  //------------------------------------------------------------------------
  vector<float> newCalib(m_numCrystals);
  vector<float> newCalibUnc(m_numCrystals);
 
  vector<float> newBhabhaMinusCustomPrevCalib__cid(m_numCrystals);
  vector<float> newBhabhaMinusCustomPrevBhabhaCalib__cid(m_numCrystals);
  vector<float> newBhabhaMinusCustomPrevCalib;
  vector<float> newBhabhaMinusCustomPrevBhabhaCalib;
 
 
  // Loop over each crystal we want to check
  for (int ic = 0; ic < m_numCrystals; ic++) {
    B2DEBUG(29, "Merging crystal " << ic + 1);
    int crate_id_from_crystal = crystalMapper->getCrateID(ic + 1);
 
    // Determine if the current crystal is a reference crystal
    bool isRefCrys = false ;
    for (int icrate = 0; icrate < m_numCrates; icrate++) {
      if (ic + 1 == refCrystalPerCrate[icrate]) {
        isRefCrys = true;
        B2INFO("Crystal " << ic + 1 << " is a reference crystal");
        break;
      }
      B2DEBUG(29, "Checked reference crystal for crate " <<  icrate + 1);
    }
    B2DEBUG(29, "Checked ref crystal");
 
    string whichCalibUsed = "bhabha";
 
    // By default set the new calibration to the bhabha calibration
    newCalib[ic] = bhabhaCalib[ic];
    newCalibUnc[ic] = fabs(bhabhaCalibUnc[ic]);
 
    double newMinusMerged ;
    double newMinusBhabha ;
 
 
    /* If the crystal is not a reference crystal and there is no bhabha
       calib for that crystal then use a different calibration.  If the
       crystal is not a reference crystal and the crystal has a bad bhabha
       crystal calibration uncertainty. */
    if ((!isRefCrys)             &&
        ((bhabhaCalib[ic] == 0) || (! bhabhaCalibGoodQuality[ic]))) {
 
      /* If there is a radiative bhabha calibration for this crystal then
         use it otherwise use the cosmic calibration */
      if (bhabhaGammaCalib[ic] != 0 || bhabhaGammaCalibGoodQuality[ic]) {
        newCalib[ic] = bhabhaGammaCalib[ic] ;
        newCalibUnc[ic] = fabs(bhabhaGammaCalibUnc[ic]);
        whichCalibUsed = "bhabhaGamma";
      } else {
        newCalib[ic] = cosmicCalibShifted[ic] ;
        newCalibUnc[ic] = cosmicCalibShiftedUnc[ic];
        whichCalibUsed = "cosmic";
      }
    } else {
      newMinusMerged = (newCalib[ic] - prevValuesCrys[ic]) * TICKS_TO_NS;
      newMinusBhabha = (newCalib[ic] - prevBhabhaValuesCrys[ic]) * TICKS_TO_NS;
 
      newBhabhaMinusCustomPrevCalib__cid[ic] = newMinusMerged;
      newBhabhaMinusCustomPrevBhabhaCalib__cid[ic] = newMinusBhabha;
      newBhabhaMinusCustomPrevCalib.push_back(newMinusMerged);
      newBhabhaMinusCustomPrevBhabhaCalib.push_back(newMinusBhabha);
    }
 
    newMinusMerged = (newCalib[ic] - prevValuesCrys[ic]) * TICKS_TO_NS;
    newMinusBhabha = (newCalib[ic] - prevBhabhaValuesCrys[ic]) * TICKS_TO_NS;
 
 
    B2INFO("Crystal " << ic + 1 << ", crate " << crate_id_from_crystal <<
           "::: bhabha = " << bhabhaCalib[ic] << "+-" << bhabhaCalibUnc[ic] <<
           " ticks, rad bhabha = " << bhabhaGammaCalib[ic] << "+-" << bhabhaGammaCalibUnc[ic]  <<
           " ticks, cosmic UNshifted = " << cosmicCalib[ic] << "+-" << cosmicCalibUnc[ic]  <<
           " ticks, cosmic shifted = " << cosmicCalibShifted[ic] << "+-" << cosmicCalibShiftedUnc[ic]  <<
           " ticks. ||| New calib = " << newCalib[ic] << " ticks, selected " << whichCalibUsed);
    B2INFO("   Crystal " << ic + 1 << ", pre calib ts = " << prevValuesCrys[ic] <<
           ", pre calib bhabha ts = " << prevBhabhaValuesCrys[ic] <<
           " ticks |||  new - pre calib ts = " << newMinusMerged <<
           ", new - pre calib bhabha ts = " << newMinusBhabha << " ns");
  } // end of setting new calibration for each crystal
 
 
 
  //------------------------------------------------------------------------
  //..Histograms of calibrations
 
  // Just in case, we remember the current TDirectory so we can return to it
  TDirectory* executeDir = gDirectory;
 
  TString fname = debugFilename;
  TFile hfile(fname, "recreate");
 
  TString htitle = "ECLCrystalTimeOffsetBhabha;cellID;Bhabha ts values  [ticks]";
  TH1F* bhabhaPayload = new TH1F("bhabhaPayload", htitle, m_numCrystals, 1, 8737);
 
  htitle = "ECLCrystalTimeOffsetBhabhaGamma;cellID;Radiative bhabha ts values  [ticks]";
  TH1F* bhabhaGammaPayload = new TH1F("bhabhaGammaPayload", htitle, m_numCrystals, 1, 8737);
 
  htitle = "ECLCrystalTimeOffsetCosmic : unshifted;cellID;Unshifted cosmic ts values  [ticks]";
  TH1F* cosmicPayload = new TH1F("cosmicUnshiftedPayload", htitle, m_numCrystals, 1, 8737);
 
  htitle = "ECLCrystalTimeOffsetCosmic : shifted;cellID;Shifted cosmic ts values  [ticks]";
  TH1F* cosmicShiftedPayload = new TH1F("cosmicShiftedPayload", htitle, m_numCrystals, 1, 8737);
 
  htitle = "New ECLCrystalTimeOffset;cellID;New (merged) ts values  [ticks]";
  TH1F* newPayload = new TH1F("newPayload", htitle, m_numCrystals, 1, 8737);
 
 
  htitle = "ECLCrystalTimeOffsetBhabha : 'pre-calib' values;cellID;Pre-calibration bhabha ts values  [ticks]";
  TH1F* tsCustomPrevBhabha_payload = new TH1F("tsCustomPrevBhabha_payload", htitle, m_numCrystals, 1, 8737);
 
  htitle = "ECLCrystalTimeOffset : 'pre-calib' values;cellID;Pre-calibration merged ts values  [ticks]";
  TH1F* tsCustomPrev_payload = new TH1F("tsCustomPrev_payload", htitle, m_numCrystals, 1, 8737);
 
 
 
  htitle = "-Only for crystals where the new bhabha ts value is used-;cellID;ts(new | bhabha) - ts(old = 'pre-calib' | merged)  [ns]";
  TH1F* newBhabhaMinusCustomPrev__cid = new TH1F("newBhabhaMinusCustomPrev__cid", htitle, m_numCrystals, 1, 8737);
 
  htitle = "-Only for crystals where the new bhabha ts value is used-;cellID;ts(new | bhabha) - ts(old = 'pre-calib' | bhabha)  [ns]";
  TH1F* newBhabhaMinusCustomPrevBhabha__cid = new TH1F("newBhabhaMinusCustomPrevBhabha__cid", htitle, m_numCrystals, 1, 8737);
 
  htitle = "-Only for crystals where the new bhabha ts value is used-;ts(new | bhabha) - ts(old = 'pre-calib' | merged)  [ns];Number of crystals";
  auto tsNewBhabha_MINUS_tsCustomPrev = new TH1F("TsNewBhabha_MINUS_TsCustomPrev", htitle, 285, -69.5801, 69.5801);
 
  htitle = "-Only for crystals where the new bhabha ts value is used-;ts(new | bhabha) - ts(old = 'pre-calib' | bhabha)  [ns];Number of crystals";
  auto tsNewBhabha_MINUS_tsCustomPrevBhabha = new TH1F("TsNewBhabha_MINUS_TsCustomPrevBhabha", htitle, 285, -69.5801, 69.5801);
 
 
  for (int cellID = 1; cellID <= m_numCrystals; cellID++) {
    bhabhaPayload->SetBinContent(cellID, bhabhaCalib[cellID - 1]);
    bhabhaPayload->SetBinError(cellID, fabs(bhabhaCalibUnc[cellID - 1]));
 
    bhabhaGammaPayload->SetBinContent(cellID, bhabhaGammaCalib[cellID - 1]);
    bhabhaGammaPayload->SetBinError(cellID, fabs(bhabhaGammaCalibUnc[cellID - 1]));
 
    cosmicPayload->SetBinContent(cellID, cosmicCalib[cellID - 1]);
    cosmicPayload->SetBinError(cellID, cosmicCalibUnc[cellID - 1]);
 
    cosmicShiftedPayload->SetBinContent(cellID, cosmicCalibShifted[cellID - 1]);
    cosmicShiftedPayload->SetBinError(cellID, cosmicCalibShiftedUnc[cellID - 1]);
 
    newPayload->SetBinContent(cellID, newCalib[cellID - 1]);
    newPayload->SetBinError(cellID, newCalibUnc[cellID - 1]);
 
    // Comparisons of change in ts
    if (readPrevCrysPayload) {
      newBhabhaMinusCustomPrev__cid->SetBinContent(cellID, newBhabhaMinusCustomPrevCalib__cid[cellID - 1]);
      newBhabhaMinusCustomPrev__cid->SetBinError(cellID, 0);
 
      newBhabhaMinusCustomPrevBhabha__cid->SetBinContent(cellID, newBhabhaMinusCustomPrevBhabhaCalib__cid[cellID - 1]);
      newBhabhaMinusCustomPrevBhabha__cid->SetBinError(cellID, 0);
 
 
      tsCustomPrev_payload->SetBinContent(cellID, prevValuesCrys[cellID - 1]);
      tsCustomPrev_payload->SetBinError(cellID, prevValuesCrysUnc[cellID - 1]);
 
      tsCustomPrevBhabha_payload->SetBinContent(cellID, prevBhabhaValuesCrys[cellID - 1]);
      tsCustomPrevBhabha_payload->SetBinError(cellID, fabs(prevBhabhaValuesCrysUnc[cellID - 1]));
    }
  }
 
  if (readPrevCrysPayload) {
    for (long unsigned int ib = 0; ib < newBhabhaMinusCustomPrevCalib.size(); ib++) {
      tsNewBhabha_MINUS_tsCustomPrev->Fill(newBhabhaMinusCustomPrevCalib[ib]);
    }
 
    for (long unsigned int ib = 0; ib < newBhabhaMinusCustomPrevBhabhaCalib.size(); ib++) {
      tsNewBhabha_MINUS_tsCustomPrevBhabha->Fill(newBhabhaMinusCustomPrevBhabhaCalib[ib]);
    }
  }
 
 
  hfile.cd();
  hfile.Write();
  hfile.Close();
  B2INFO("Debugging histograms written to " << fname);
  // Go back to original TDirectory
  executeDir->cd();
 
 
  /* Re-save the new bhabha calibrations to a payload.  The bhabha calibrations have NOT
     been changed; however, the best way of controlling which payloads get get uploaded to
     the GT as part of the prommp calibrations is to save a second copy in this calibration
     directory since we don't want to save all the payloads from the previous directory.
     See the "<calibration>.save_payloads = <True/False>" code in the airflow steering file.*/
  ECLCrystalCalib* bhabhaCalibCopy = new ECLCrystalCalib();
  bhabhaCalibCopy->setCalibVector(bhabhaCalib, bhabhaCalibUnc);
  saveCalibration(bhabhaCalibCopy, "ECLCrystalTimeOffsetBhabha");
 
  // Save the new merged calibrations to a payload
  ECLCrystalCalib* newCrystalTimes = new ECLCrystalCalib();
  newCrystalTimes->setCalibVector(newCalib, newCalibUnc);
  saveCalibration(newCrystalTimes, "ECLCrystalTimeOffset");
  return c_OK;
}