MatrixECALDetIds.cc

Go to the documentation of this file.

#include "DataFormats/EcalDetId/interface/EBDetId.h"
#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
#include "DataFormats/EcalDetId/interface/EEDetId.h"

#include "Calibration/IsolatedParticles/interface/MatrixECALDetIds.h"
#include "Calibration/IsolatedParticles/interface/FindDistCone.h"
#include "Calibration/IsolatedParticles/interface/DebugInfo.h"

#include <algorithm>
#include <iostream>

//#define EDM_ML_DEBUG

namespace spr{

  void matrixECALIds(const DetId& det, int ieta, int iphi,
             const CaloGeometry* geo, const CaloTopology* caloTopology,
             std::vector<DetId>& vdets, bool debug, 
             bool ignoreTransition) {

    const CaloSubdetectorTopology *barrelTopo = (caloTopology->getSubdetectorTopology(DetId::Ecal,EcalBarrel));
    const CaloSubdetectorTopology *endcapTopo = (caloTopology->getSubdetectorTopology(DetId::Ecal,EcalEndcap));
    const EcalBarrelGeometry *barrelGeom = (dynamic_cast< const EcalBarrelGeometry *> (geo->getSubdetectorGeometry(DetId::Ecal,EcalBarrel)));
    const EcalEndcapGeometry *endcapGeom = (dynamic_cast< const EcalEndcapGeometry *> (geo->getSubdetectorGeometry(DetId::Ecal,EcalEndcap)));

#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "matrixECALIds::Add " << ieta << " rows and " << iphi 
        << " columns of cells for 1 cell" << std::endl;
      spr::debugEcalDets(0, det, true);
    }
#endif
    std::vector<DetId> dets(1,det);
    std::vector<CaloDirection> dirs(1,NORTH);
    vdets = spr::newECALIdNS(dets, 0, ieta,iphi, dirs, barrelTopo, endcapTopo,
                 barrelGeom, endcapGeom, debug, ignoreTransition);
    dirs[0] = SOUTH;
    std::vector<DetId> vdetS = spr::newECALIdNS(dets, 0, ieta, iphi, dirs,
                        barrelTopo, endcapTopo, 
                        barrelGeom, endcapGeom,
                        debug, ignoreTransition);
    for (unsigned int i1=0; i1<vdetS.size(); i1++) {
      if (std::count(vdets.begin(),vdets.end(),vdetS[i1]) == 0)
    vdets.push_back(vdetS[i1]);
    }
    unsigned int ndet = (2*ieta+1)*(2*iphi+1);
    if (vdets.size() != ndet) {
      std::vector<DetId> vdetExtra;
      spr::extraIds(det, vdets, ieta, ieta, iphi, iphi, 
            barrelGeom, endcapGeom, vdetExtra, debug);
      if (!vdetExtra.empty()) 
    vdets.insert(vdets.end(), vdetExtra.begin(), vdetExtra.end());
    }

#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "matrixECALIds::Total number of cells found is " 
        << vdets.size() << std::endl;
      spr::debugEcalDets(0, vdets);
    }
#endif
  }

  std::vector<DetId> matrixECALIds(const DetId& det,int ieta,int iphi, 
                   const CaloGeometry* geo, 
                   const CaloTopology* caloTopology,
                   bool debug, bool ignoreTransition) {

    std::vector<DetId> vdets;
    spr::matrixECALIds(det, ieta, iphi, geo, caloTopology, vdets, debug, 
               ignoreTransition);
    return vdets;
  }

  std::vector<DetId> matrixECALIds(const DetId& det, double dR, 
                   const GlobalVector& trackMom,
                   const CaloGeometry* geo, 
                   const CaloTopology* caloTopology,
                   bool debug, bool ignoreTransition) {

    GlobalPoint core;
    if (det.subdetId() == EcalEndcap) {
      EEDetId EEid = EEDetId(det);
      core = geo->getPosition(EEid);
    } else {
      EBDetId EBid = EBDetId(det);
      core = geo->getPosition(EBid);
    }
    int ietaphi = (int)(dR/2.0)+1;
    std::vector<DetId> vdets, vdetx;
    spr::matrixECALIds(det, ietaphi, ietaphi, geo, caloTopology, vdets, debug,
               ignoreTransition);
    for (unsigned int i=0; i<vdets.size(); ++i) {
      GlobalPoint rpoint;
      if (vdets[i].subdetId() == EcalEndcap) {
    EEDetId EEid = EEDetId(vdets[i]);
    rpoint = geo->getPosition(EEid);
      } else {
    EBDetId EBid = EBDetId(vdets[i]);
    rpoint = geo->getPosition(EBid);
      }
      if (spr::getDistInPlaneTrackDir(core, trackMom, rpoint)<dR) {
    vdetx.push_back(vdets[i]);
      }
    }

#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "matrixECALIds::Final List of cells for dR " << dR
        << " is with " << vdetx.size() << " from original list of " 
        << vdets.size() << std::endl;
      spr::debugEcalDets(0, vdetx);
    }
#endif
    return vdetx;
  }

  void matrixECALIds(const DetId& det, int ietaE, int ietaW, int iphiN,
             int iphiS, const CaloGeometry* geo, 
             const CaloTopology* caloTopology,
             std::vector<DetId>& vdets, bool debug, 
             bool ignoreTransition) {

    const CaloSubdetectorTopology *barrelTopo = (caloTopology->getSubdetectorTopology(DetId::Ecal,EcalBarrel));
    const CaloSubdetectorTopology *endcapTopo = (caloTopology->getSubdetectorTopology(DetId::Ecal,EcalEndcap));
    const EcalBarrelGeometry *barrelGeom = (dynamic_cast< const EcalBarrelGeometry *> (geo->getSubdetectorGeometry(DetId::Ecal,EcalBarrel)));
    const EcalEndcapGeometry *endcapGeom = (dynamic_cast< const EcalEndcapGeometry *> (geo->getSubdetectorGeometry(DetId::Ecal,EcalEndcap)));

#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "matrixECALIds::Add " << ietaE << "|" << ietaW
        << " rows and " << iphiN << "|" << iphiS
        << " columns of cells for 1 cell" << std::endl;
      debugEcalDets(0, det, true);
    }
#endif
    std::vector<DetId> dets(1,det);
    std::vector<CaloDirection> dirs(1,NORTH);
    std::vector<int> jetaE(1,ietaE), jetaW(1,ietaW);
    std::vector<int> jphiN(1,iphiN), jphiS(1,iphiS);
    vdets = spr::newECALIdNS(dets, 0, jetaE, jetaW, jphiN, jphiS, dirs, 
                 barrelTopo, endcapTopo, barrelGeom,
                 endcapGeom, debug, ignoreTransition);
    dirs[0] = SOUTH;
    std::vector<DetId> vdetS = spr::newECALIdNS(dets, 0, jetaE, jetaW, jphiN,
                        jphiS, dirs, barrelTopo,
                        endcapTopo, barrelGeom,
                        endcapGeom, debug,
                        ignoreTransition);
    for (unsigned int i1=0; i1<vdetS.size(); i1++) {
      if (std::count(vdets.begin(),vdets.end(),vdetS[i1]) == 0)
    vdets.push_back(vdetS[i1]);
    }

    unsigned int ndet = (ietaE+ietaW+1)*(iphiN+iphiS+1);
    if (vdets.size() != ndet) {
      std::vector<DetId> vdetExtra;
      spr::extraIds(det, vdets, ietaE, ietaW, iphiN, iphiS, 
            barrelGeom, endcapGeom, vdetExtra, debug);
      if (!vdetExtra.empty()) 
    vdets.insert(vdets.end(), vdetExtra.begin(), vdetExtra.end());
    }

#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "matrixECALIds::Total number of cells found is " 
        << vdets.size() << std::endl;
      spr::debugEcalDets(0, vdets);
    }
#endif
  }

  std::vector<DetId> matrixECALIds(const DetId& det, int ietaE, int ietaW,
                   int iphiN, int iphiS,
                   const CaloGeometry* geo, 
                   const CaloTopology* caloTopology,
                   bool debug, bool ignoreTransition) {

    std::vector<DetId> vdets;
    spr::matrixECALIds(det, ietaE, ietaW, iphiN, iphiS, geo, caloTopology,
               vdets, debug, ignoreTransition);
    return vdets;
  }

  std::vector<DetId> newECALIdNS(std::vector<DetId>& dets, unsigned int last,
                 int ieta, int iphi, 
                 std::vector<CaloDirection>& dir,
                 const CaloSubdetectorTopology* barrelTopo,
                 const CaloSubdetectorTopology* endcapTopo,
                 const EcalBarrelGeometry* barrelGeom, 
                 const EcalEndcapGeometry* endcapGeom,
                 bool debug, bool ignoreTransition) {

#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "newECALIdNS::Add " << iphi << " columns of cells for " 
        << (dets.size()-last) << " cells (last " << last << ")"
        << std::endl;
      spr::debugEcalDets(last, dets, dir);
    }
#endif    
    std::vector<DetId> vdets;
    std::vector<CaloDirection> dirs;
    vdets.insert(vdets.end(), dets.begin(), dets.end());
    dirs.insert(dirs.end(), dir.begin(), dir.end());

    std::vector<DetId> vdetE, vdetW;
    if (last == 0) {
      unsigned int ndet = vdets.size();
      std::vector<CaloDirection> dirE(ndet,EAST), dirW(ndet,WEST);
      vdetE = spr::newECALIdEW(dets, last, ieta, dirE, barrelTopo, endcapTopo, 
                   barrelGeom, endcapGeom, debug, ignoreTransition);
      vdetW = spr::newECALIdEW(dets, last, ieta, dirW, barrelTopo, endcapTopo,
                   barrelGeom, endcapGeom, debug, ignoreTransition);
      for (unsigned int i1=0; i1<vdetW.size(); i1++) {
    if (std::count(vdets.begin(),vdets.end(),vdetW[i1]) == 0) {
      vdets.push_back(vdetW[i1]);
      dirs.push_back(dir[0]);
    }
      }
      for (unsigned int i1=0; i1<vdetE.size(); i1++) {
    if (std::count(vdets.begin(),vdets.end(),vdetE[i1]) == 0) {
      vdets.push_back(vdetE[i1]);
      dirs.push_back(dir[0]);
    }
      }
#ifdef EDM_ML_DEBUG
      if (debug) {
    std::cout <<"newECALIdNS::With Added cells along E/W results a set of "
          << (vdets.size()-dets.size()) << " new  cells" << std::endl;
    spr::debugEcalDets(dets.size(), vdets, dirs);
      }
#endif
    }

    unsigned int last0 = vdets.size();
    std::vector<DetId> vdetnew;
    std::vector<CaloDirection> dirnew;
    if (iphi > 0) {
      std::vector<DetId> vdetn(1);
      std::vector<CaloDirection> dirn(1);
      std::vector<CaloDirection> dirnE(1,EAST), dirnW(1,WEST);
      int flag=0;
      for (unsigned int i1=last; i1<dets.size(); i1++) {
        std::vector<DetId> cells;
        spr::simpleMove(dets[i1], dir[i1], barrelTopo, endcapTopo,
                        barrelGeom, endcapGeom, cells, flag,
            debug, ignoreTransition);
    if (flag != 0) {
      if (std::count(vdets.begin(),vdets.end(),cells[0]) == 0) {
        vdetn[0] = cells[0];
        vdetnew.push_back(vdetn[0]);
        dirn[0] = dir[i1];
        if (flag < 0) {
          if (dirn[0] == NORTH) dirn[0] = SOUTH;
          else                  dirn[0] = NORTH;
        }
        dirnew.push_back(dirn[0]);
        vdetE = spr::newECALIdEW(vdetn, 0, ieta, dirnE, barrelTopo, 
                     endcapTopo, barrelGeom, endcapGeom,
                     debug, ignoreTransition);
        vdetW = spr::newECALIdEW(vdetn, 0, ieta, dirnW, barrelTopo, 
                     endcapTopo, barrelGeom, endcapGeom,
                     debug, ignoreTransition);
        for (unsigned int i2=0; i2<vdetW.size(); i2++) {
          if (std::count(vdets.begin(),vdets.end(),vdetW[i2]) == 0 &&
          std::count(vdetnew.begin(),vdetnew.end(),vdetW[i2]) == 0) {
        vdets.push_back(vdetW[i2]);
        dirs.push_back(dirn[0]);
          }
        }
        for (unsigned int i2=0; i2<vdetE.size(); i2++) {
          if (std::count(vdets.begin(),vdets.end(),vdetE[i2]) == 0 &&
          std::count(vdetnew.begin(),vdetnew.end(),vdetE[i2]) == 0) {
        vdets.push_back(vdetE[i2]);
        dirs.push_back(dirn[0]);
          }
        }
      }
    }
      }
      iphi--;
      last = vdets.size();
      for (unsigned int i2=0; i2<vdetnew.size(); i2++) {
    if (std::count(vdets.begin(),vdets.end(),vdetnew[i2]) == 0) {
      vdets.push_back(vdetnew[i2]);
      dirs.push_back(dirnew[i2]);
    }
      }
#ifdef EDM_ML_DEBUG
      if (debug) {
    std::cout << "newECALIdNS::Addition results a set of " 
          << (vdets.size()-last0)  << " new  cells (last " << last0
          << ", iphi " << iphi << ")" << std::endl;
    spr::debugEcalDets(last0, vdets, dirs);
      }
#endif
      last0 = last;
    }

    if (iphi > 0) {
      last = last0;
      return spr::newECALIdNS(vdets, last, ieta, iphi, dirs, barrelTopo,
                  endcapTopo, barrelGeom, endcapGeom, 
                  debug, ignoreTransition);
    } else {
#ifdef EDM_ML_DEBUG
      if (debug) {
    std::cout << "newECALIdNS::Final list consists of " << vdets.size()
          << " cells" << std::endl;
    spr::debugEcalDets(0, vdets);
      }
#endif
      return vdets;
    }
  }

  std::vector<DetId> newECALIdNS(std::vector<DetId>& dets, unsigned int last,
                 std::vector<int>& ietaE, 
                 std::vector<int>& ietaW, 
                 std::vector<int>& iphiN, 
                 std::vector<int>& iphiS,
                 std::vector<CaloDirection>& dir,
                 const CaloSubdetectorTopology* barrelTopo,
                 const CaloSubdetectorTopology* endcapTopo,
                 const EcalBarrelGeometry* barrelGeom, 
                 const EcalEndcapGeometry* endcapGeom,
                 bool debug, bool ignoreTransition) {

#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "newECALIdNS::Add columns of cells for " 
        << (dets.size()-last) << " cells (last) " << last << std::endl;
      for (unsigned int i1=last; i1<dets.size(); i1++) {
    spr::debugEcalDets (i1, dets[i1], false);
    std::cout << " along " << dir[i1] << " # " << iphiN[i1] << "|" 
          << iphiS[i1] << std::endl;
      }
    }
#endif
    std::vector<DetId> vdets;
    std::vector<CaloDirection> dirs;
    std::vector<int> jetaE, jetaW, jphiN, jphiS;
    vdets.insert(vdets.end(), dets.begin(), dets.end());
    dirs.insert(dirs.end(), dir.begin(), dir.end());
    jetaE.insert(jetaE.end(), ietaE.begin(), ietaE.end());
    jetaW.insert(jetaW.end(), ietaW.begin(), ietaW.end());
    jphiN.insert(jphiN.end(), iphiN.begin(), iphiN.end());
    jphiS.insert(jphiS.end(), iphiS.begin(), iphiS.end());
    std::vector<DetId> vdetE, vdetW;
    if (last == 0) {
      unsigned int ndet = vdets.size();
      std::vector<CaloDirection> dirE(ndet,EAST), dirW(ndet,WEST);
      vdetE = spr::newECALIdEW(dets, last, ietaE, ietaW, dirE, barrelTopo, 
                   endcapTopo, barrelGeom, endcapGeom, 
                   debug, ignoreTransition);
      vdetW = spr::newECALIdEW(dets, last, ietaE, ietaW, dirW, barrelTopo,
                   endcapTopo, barrelGeom, endcapGeom, 
                   debug, ignoreTransition);
      for (unsigned int i1=0; i1<vdetW.size(); i1++) {
    if (std::count(vdets.begin(),vdets.end(),vdetW[i1]) == 0) {
      vdets.push_back(vdetW[i1]);
      dirs.push_back(dir[0]);
      jetaE.push_back(0);
      jetaW.push_back(0);
      jphiN.push_back(iphiN[0]);
      jphiS.push_back(iphiS[0]);
    }
      }
      for (unsigned int i1=0; i1<vdetE.size(); i1++) {
    if (std::count(vdets.begin(),vdets.end(),vdetE[i1]) == 0) {
      vdets.push_back(vdetE[i1]);
      dirs.push_back(dir[0]);
      jetaE.push_back(0);
      jetaW.push_back(0);
      jphiN.push_back(iphiN[0]);
      jphiS.push_back(iphiS[0]);
    }
      }
#ifdef EDM_ML_DEBUG
      if (debug) {
    std::cout <<"newECALIdNS::With Added cells along E/W results a set of "
          << (vdets.size()-dets.size()) << " new  cells" << std::endl;
    spr::debugEcalDets(dets.size(), vdets, dirs);
      }
#endif
    }

    unsigned int last0 = vdets.size();
    std::vector<DetId> vdetnew;
    std::vector<CaloDirection> dirnew;
    std::vector<int> kphiN, kphiS, ketaE, ketaW;
    int kphi = 0;
    for (unsigned int i1=last; i1<dets.size(); i1++) {
      int iphi = iphiS[i1];
      if (dir[i1] == NORTH) iphi = iphiN[i1];
      if (iphi > 0) {
    std::vector<DetId>         vdetn(1);
    std::vector<CaloDirection> dirn(1);
    std::vector<CaloDirection> dirnE(1,EAST), dirnW(1,WEST);
    int flag=0;
    std::vector<DetId> cells;
    spr::simpleMove(dets[i1], dir[i1], barrelTopo, endcapTopo,
            barrelGeom, endcapGeom, cells, flag, 
            debug, ignoreTransition);
    iphi--;
    if (iphi > kphi) kphi = iphi;
    if (dir[i1] == NORTH) jphiN[i1] = iphi;
    else                  jphiS[i1] = iphi;
    if (flag != 0) {
      if (std::count(vdets.begin(),vdets.end(),cells[0]) == 0) {
        int kfiN = iphiN[i1];
        int kfiS = iphiS[i1];
        vdetn[0] = cells[0];
        vdetnew.push_back(vdetn[0]);
        dirn[0] = dir[i1];
        if (dir[i1] == NORTH) kfiN = iphi;
        else                  kfiS = iphi;
        if (flag < 0) {
          int ktmp = kfiS; kfiS = kfiN; kfiN = ktmp;
          if (dirn[0] == NORTH) dirn[0] = SOUTH;
          else                  dirn[0] = NORTH;
        }
        dirnew.push_back(dirn[0]);
        kphiN.push_back(kfiN); ketaE.push_back(ietaE[i1]);
        kphiS.push_back(kfiS); ketaW.push_back(ietaW[i1]);
        std::vector<int>       ietE(1,ietaE[i1]), ietW(1,ietaW[i1]);
        vdetE = spr::newECALIdEW(vdetn, 0, ietE, ietW, dirnE, barrelTopo,
                     endcapTopo, barrelGeom, endcapGeom,
                     debug, ignoreTransition);
        vdetW = spr::newECALIdEW(vdetn, 0, ietE, ietW, dirnW, barrelTopo,
                     endcapTopo, barrelGeom, endcapGeom,
                     debug, ignoreTransition);
        for (unsigned int i2=0; i2<vdetW.size(); i2++) {
          if (std::count(vdets.begin(),vdets.end(),vdetW[i2]) == 0 &&
          std::count(vdetnew.begin(),vdetnew.end(),vdetW[i2]) == 0) {
        vdets.push_back(vdetW[i2]);
        dirs.push_back(dirn[0]);
        jetaE.push_back(0); jphiN.push_back(kfiN);
        jetaW.push_back(0); jphiS.push_back(kfiS);
          }
        }
        for (unsigned int i2=0; i2<vdetE.size(); i2++) {
          if (std::count(vdets.begin(),vdets.end(),vdetE[i2]) == 0 &&
          std::count(vdetnew.begin(),vdetnew.end(),vdetE[i2]) == 0) {
        vdets.push_back(vdetE[i2]);
        dirs.push_back(dirn[0]);
        jetaE.push_back(0); jphiN.push_back(kfiN);
        jetaW.push_back(0); jphiS.push_back(kfiS);
          }
        }
      } 
    }
      }
    }
    last = vdets.size();
    for (unsigned int i2=0; i2<vdetnew.size(); i2++) {
      if (std::count(vdets.begin(),vdets.end(),vdetnew[i2]) == 0) {
    vdets.push_back(vdetnew[i2]);
    dirs.push_back(dirnew[i2]);
    jetaE.push_back(ketaE[i2]);
    jetaW.push_back(ketaW[i2]);
    jphiN.push_back(kphiN[i2]);
    jphiS.push_back(kphiS[i2]);
      }
    }
#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "newECALIdNS::Addition results a set of " 
        << (vdets.size()-last0)  << " new  cells (last " << last0
        << ", iphi " << kphi << ")" << std::endl;
      for (unsigned int i1=last0; i1<vdets.size(); i1++) {
    spr::debugEcalDets (i1, vdets[i1], false);
    std::cout << " along " << dirs[i1] << " iphi " << jphiN[i1] << "|" 
          << jphiS[i1] << " ieta " << jetaE[i1] << "|" << jetaW[i1] 
          << std::endl;
      }
    }
#endif
    last0 = last;
      
    if (kphi > 0) {
      last = last0;
      return spr::newECALIdNS(vdets, last, jetaE, jetaW, jphiN, jphiS, dirs,
                  barrelTopo, endcapTopo, barrelGeom, endcapGeom,
                  debug, ignoreTransition);
    } else {
#ifdef EDM_ML_DEBUG
      if (debug) {
    std::cout << "newECALIdNS::Final list consists of " << vdets.size()
          << " cells" << std::endl;
    spr::debugEcalDets (0, vdets);
      }
#endif
      return vdets;
    }
  }

  std::vector<DetId> newECALIdEW(std::vector<DetId>& dets, unsigned int last,
                 int ieta, std::vector<CaloDirection>& dir, 
                 const CaloSubdetectorTopology* barrelTopo, 
                 const CaloSubdetectorTopology* endcapTopo, 
                 const EcalBarrelGeometry* barrelGeom, 
                 const EcalEndcapGeometry* endcapGeom,
                 bool debug, bool ignoreTransition) {

#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "newECALIdEW::Add " << ieta << " rows of cells for " 
        << last << ":" << dets.size() << ":" << (dets.size()-last) 
                << " cells" << std::endl;
      spr::debugEcalDets (last, dets, dir);
    }
#endif
    std::vector<DetId> vdets; vdets.clear();
    std::vector<CaloDirection> dirs; dirs.clear();
    vdets.insert(vdets.end(), dets.begin(), dets.end());
    dirs.insert(dirs.end(), dir.begin(), dir.end());

    if (ieta > 0) {
      for (unsigned int i1=last; i1<dets.size(); i1++) {
    int flag = 0;
    std::vector<DetId> cells;
    spr::simpleMove(dets[i1], dir[i1], barrelTopo, endcapTopo,
            barrelGeom, endcapGeom, cells, flag, 
            debug, ignoreTransition);
    if (flag != 0) {
      if (std::count(vdets.begin(),vdets.end(),cells[0]) == 0) {
        CaloDirection dirn = dir[i1];
        if (flag < 0) {
          if (dirn == EAST) dirn = WEST;
          else              dirn = EAST;
        }
        vdets.push_back(cells[0]);
        dirs.push_back(dirn);
      }
    }
      }
      ieta--;
    }
    
#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "newECALIdEW::Addition results a set of " 
        << (vdets.size()-dets.size()) << " new  cells" << std::endl;
      spr::debugEcalDets (dets.size(), vdets, dirs);
    }
#endif
    if (ieta > 0) {
      last = dets.size();
      return spr::newECALIdEW(vdets, last, ieta, dirs, barrelTopo, endcapTopo,
                  barrelGeom, endcapGeom, debug, ignoreTransition);
    } else {
#ifdef EDM_ML_DEBUG
      if (debug) {
    std::cout << "newECALIdEW::Final list (EW) consists of " <<vdets.size()
          << " cells" << std::endl;
    spr::debugEcalDets (0, vdets);
      }
#endif
      return vdets;
    }
  }

  std::vector<DetId> newECALIdEW(std::vector<DetId>& dets, unsigned int last,
                 std::vector<int>& ietaE, 
                 std::vector<int>& ietaW,
                 std::vector<CaloDirection>& dir, 
                 const CaloSubdetectorTopology* barrelTopo, 
                 const CaloSubdetectorTopology* endcapTopo, 
                 const EcalBarrelGeometry* barrelGeom, 
                 const EcalEndcapGeometry* endcapGeom,
                 bool debug, bool ignoreTransition) {

#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "newECALIdEW::Add " << ietaE[0] << "|" << ietaW[0]
        << " rows of cells for " << (dets.size()-last) 
        << " cells (last " << last << ")" << std::endl;
      spr::debugEcalDets (last, dets, dir);
    }
#endif
    std::vector<DetId> vdets;
    vdets.insert(vdets.end(), dets.begin(), dets.end());
    std::vector<CaloDirection> dirs;
    dirs.insert(dirs.end(), dir.begin(), dir.end());
    std::vector<int> jetaE, jetaW;
    jetaE.insert(jetaE.end(), ietaE.begin(), ietaE.end());
    jetaW.insert(jetaW.end(), ietaW.begin(), ietaW.end());
    int keta = 0;
    for (unsigned int i1=last; i1<dets.size(); i1++) {
      int ieta = ietaW[i1];
      if (dir[i1] == EAST) ieta = ietaE[i1]; 
      if (ieta > 0) {
    int flag=0;
    std::vector<DetId> cells;
    spr::simpleMove(dets[i1], dir[i1], barrelTopo, endcapTopo,
            barrelGeom, endcapGeom, cells, flag, 
            debug, ignoreTransition);
    ieta--;
    if (ieta > keta) keta = ieta;
    if (dir[i1] == EAST) jetaE[i1] = ieta;
    else                 jetaW[i1] = ieta;
    if (flag != 0) {
      if (std::count(vdets.begin(),vdets.end(),cells[0]) == 0) {
        vdets.push_back(cells[0]);
        CaloDirection dirn = dir[i1];
        int ketaE = ietaE[i1];
        int ketaW = ietaW[i1];
        if (dirn == EAST) ketaE = ieta;
        else              ketaW = ieta;
        if (flag < 0) {
          int ktmp = ketaW; ketaW    = ketaE; ketaE    = ktmp;
          if (dirn == EAST) dirn = WEST;
          else              dirn = EAST;
        }
        dirs.push_back(dirn);
        jetaE.push_back(ketaE);
        jetaW.push_back(ketaW);
      }
    }
      }
    }
    
#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "newECALIdEW::Addition results a set of " 
        << (vdets.size()-dets.size()) << " new  cells (last " 
        << dets.size() << ", ieta " << keta << ")" << std::endl;
      spr::debugEcalDets (dets.size(), vdets);
    }
#endif
    if (keta > 0) {
      last = dets.size();
      return spr::newECALIdEW(vdets, last, jetaE, jetaW, dirs, barrelTopo,
                  endcapTopo, barrelGeom, endcapGeom, 
                  debug, ignoreTransition);
    } else {
#ifdef EDM_ML_DEBUG
      if (debug) {
    std::cout << "newECALIdEW::Final list (EW) consists of " <<vdets.size()
          << " cells" << std::endl;
    spr::debugEcalDets (0, vdets);
      }
#endif
      return vdets;
    }
  }

  void simpleMove(DetId& det, const CaloDirection& dir, 
          const CaloSubdetectorTopology* barrelTopo, 
          const CaloSubdetectorTopology* endcapTopo, 
          const EcalBarrelGeometry* barrelGeom, 
          const EcalEndcapGeometry* endcapGeom, 
          std::vector<DetId>& cells, int& ok, bool
#ifdef EDM_ML_DEBUG
          debug
#endif
          , bool ignoreTransition) {

    DetId cell;
    ok = 0;
    if (det.subdetId() == EcalBarrel) {
      EBDetId detId = det;
      std::vector<DetId> neighbours = barrelTopo->getNeighbours(detId,dir);
      if (!neighbours.empty() && !neighbours[0].null()) {
    cells.push_back(neighbours[0]);
    cell = neighbours[0];
    ok   = 1;
      } else {
    const int ietaAbs ( detId.ietaAbs() ) ; // abs value of ieta
    if (EBDetId::MAX_IETA == ietaAbs && (!ignoreTransition) && endcapGeom) {
      // get ee nbrs for for end of barrel crystals
      const EcalBarrelGeometry::OrderedListOfEEDetId&
        ol( * barrelGeom->getClosestEndcapCells(detId) ) ;
      // take closest neighbour on the other side, that is in the endcap
      cell = *(ol.begin() );
      neighbours = endcapTopo->getNeighbours(cell,dir);
      if (!neighbours.empty() && !neighbours[0].null()) ok = 1;
      else                                              ok =-1;
      for (EcalBarrelGeometry::OrderedListOfEEDetId::const_iterator iptr=ol.begin(); iptr != ol.end(); ++iptr)
        cells.push_back(*iptr);
    }
      }
    } else if (det.subdetId() == EcalEndcap && endcapGeom) {
      EEDetId detId = det;
      std::vector<DetId> neighbours = endcapTopo->getNeighbours(detId,dir);
      if (!neighbours.empty() && !neighbours[0].null()) {
    cells.push_back(neighbours[0]);
    cell = neighbours[0];
    ok   = 1;
      } else {
    // are we on the outer ring ?
    const int iphi ( detId.iPhiOuterRing() ) ;
//  int isc = detId.isc();
    if (iphi != 0 && (!ignoreTransition)) {
      // get eb nbrs for for end of endcap crystals
      const EcalEndcapGeometry::OrderedListOfEBDetId&
        ol( * endcapGeom->getClosestBarrelCells(detId) ) ;
      // take closest neighbour on the other side, that is in the barrel.
      cell = *(ol.begin() );
      neighbours = barrelTopo->getNeighbours(cell,dir);
      if (!neighbours.empty() && !neighbours[0].null()) ok = 1;
      else                                              ok =-1;
      for (EcalEndcapGeometry::OrderedListOfEBDetId::const_iterator iptr=ol.begin(); iptr != ol.end(); ++iptr)
        cells.push_back(*iptr);
    }
      }
    }  
#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "simpleMove:: Move DetId 0x" << std::hex << det() 
        << std::dec << " along " << dir << " to get 0x" << std::hex
        << cell() << std::dec << " with flag " << ok << " # "
        << cells.size();
      for (unsigned int i1=0; i1<cells.size(); ++i1) 
    std::cout << " " << std::hex << cells[0]() << std::dec;
      std::cout << std::endl;
    }
#endif
  }

  void extraIds(const DetId& det, std::vector<DetId>& dets, int ietaE, 
        int ietaW, int iphiN, int iphiS, 
        const EcalBarrelGeometry* barrelGeom, 
        const EcalEndcapGeometry* endcapGeom, 
        std::vector<DetId>& cells, bool
#ifdef EDM_ML_DEBUG
        debug
#endif
        ) {

    if (det.subdetId() == EcalBarrel) {
      EBDetId id = det;
#ifdef EDM_ML_DEBUG
      if (debug) std::cout << "extraIds::Cell " << id << " rows "  << ietaW
               << "|" << ietaE << " columns " << iphiS << "|"
               << iphiN << std::endl;
#endif
      int etaC = id.ietaAbs();
      int phiC = id.iphi();
      int zsid = id.zside();
      for (int eta = -ietaW; eta <= ietaE; ++eta) {
    for (int phi = -iphiS; phi <= iphiN; ++phi) {
      int iphi = phiC+phi;
      if (iphi < 0)        iphi += 360;
      else if (iphi > 360) iphi -= 360;    
      int ieta = zsid*(etaC+eta);
      if (EBDetId::validDetId(ieta,iphi)) {
        id = EBDetId(ieta,iphi);
        if (barrelGeom->present(id)) {
          if (std::count(dets.begin(),dets.end(),(DetId)id) == 0) {
        cells.push_back((DetId)id);
          }
        }
      }
    }
      }
    } else if (det.subdetId() == EcalEndcap && endcapGeom) {
      EEDetId id = det;
#ifdef EDM_ML_DEBUG
      if (debug) std::cout << "extraIds::Cell " << id << " rows "  << ietaW
               << "|" << ietaE << " columns " << iphiS << "|"
               << iphiN << std::endl;
#endif
      int ixC  = id.ix();
      int iyC  = id.iy();
      int zsid = id.zside();
      for (int kx = -ietaW; kx <= ietaE; ++kx) {
    for (int ky = -iphiS; ky <= iphiN; ++ky) {
      int ix = ixC+kx;
      int iy = iyC+ky;
      if (EEDetId::validDetId(ix,iy,zsid)) {
        id = EEDetId(ix,iy,zsid);
        if (endcapGeom->present(id)) {
          if (std::count(dets.begin(),dets.end(),(DetId)id) == 0) {
        cells.push_back((DetId)id);
          }
        }
      }
    }
      }
    } 

#ifdef EDM_ML_DEBUG
    if (debug) {
      std::cout << "extraIds:: finds " << cells.size() << " new cells" 
        << std::endl;
      spr::debugEcalDets (0, cells);
    }
#endif
  }
}