Skip to content
This repository was archived by the owner on May 3, 2024. It is now read-only.

Commit

Permalink
remove old parts now in calocluster
Browse files Browse the repository at this point in the history
  • Loading branch information
@web-flow @tomeichlersmith
web-flow authored and tomeichlersmith committed Apr 17, 2024
1 parent 02598b4 commit 4be39bc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 155 deletions.
119 changes: 2 additions & 117 deletions include/Ecal/Event/EcalCluster.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@
#ifndef EVENT_ECALCLUSTER_H_
#define EVENT_ECALCLUSTER_H_

/* // ROOT */
/* #include "TObject.h" //For ClassDef */
/* #include "TString.h" */

/* // STL */
/* #include <iostream> */
/* #include <set> */

// ldmx-sw
#include "Ecal/Event/EcalHit.h"
#include "Recon/Event/CaloCluster.h"
Expand All @@ -37,127 +29,20 @@ class EcalCluster : public ldmx::CaloCluster {
*/
virtual ~EcalCluster();

/* /\** */
/* * Print a description of this object. */
/* *\/ */
/* void Print() const; */

/* /\** */
/* * Reset the EcalCluster object. */
/* *\/ */
/* void Clear(); */

/**
* Take in the hits that make up the cluster.
* @param hit The digi hit's entry number in the events digi
* collection.
*/
void addHits(const std::vector<const ldmx::EcalHit*> hitsVec);

/* /\** */
/* * Sets total energy for the cluster. */
/* * @param energy The total energy of the cluster. */
/* *\/ */
/* void setEnergy(double energy) { energy_ = energy; } */

/* /\** */
/* * Sets total number of hits in the cluster. */
/* * @param nHits The total number of hits. */
/* *\/ */
/* void setNHits(int nHits) { nHits_ = nHits; } */

/* /\** */
/* * Sets a sorted vector for the IDs of the hits */
/* * that make up the cluster. */
/* * @param IDs Sorted vector of hit IDs. */
/* *\/ */
/* void setIDs(std::vector<unsigned int>& hitIDs) { hitIDs_ = hitIDs; } */

/* void setHitValsX(std::vector<float>& x) { hitX_ = x; } */
/* void setHitValsY(std::vector<float>& x) { hitY_ = x; } */
/* void setHitValsZ(std::vector<float>& x) { hitZ_ = x; } */
/* void setHitValsE(std::vector<float>& x) { hitE_ = x; } */

/* /\** */
/* * Sets the three coordinates of the cluster centroid */
/* * @param x The x coordinate. */
/* * @param y The y coordinate. */
/* * @param z The z coordinate. */
/* *\/ */
/* void setCentroidXYZ(double x, double y, double z) { */
/* centroidX_ = x; */
/* centroidY_ = y; */
/* centroidZ_ = z; */
/* } */

/* void setRMSXYZ(double x, double y, double z) { */
/* rmsX_ = x; */
/* rmsY_ = y; */
/* rmsZ_ = z; */
/* } */
/* void setDXDZ(double x) { DXDZ_=x; } */

/* void setDYDZ(double x) { DYDZ_=x; } */

/* void setEDXDZ(double x) { errDXDZ_=x; } */

/* void setEDYDZ(double x) { errDYDZ_=x; } */

/* double getEnergy() const { return energy_; } */

/* int getNHits() const { return nHits_; } */

/* double getCentroidX() const { return centroidX_; } */

/* double getCentroidY() const { return centroidY_; } */

/* double getCentroidZ() const { return centroidZ_; } */

/* double getRMSX() const { return rmsX_; } */

/* double getRMSY() const { return rmsY_; } */

/* double getRMSZ() const { return rmsZ_; } */

/* double getDXDZ() const { return DXDZ_; } */

/* double getDYDZ() const { return DYDZ_; } */

/* double getEDXDZ() const { return errDXDZ_; } */

/* double getEDYDZ() const { return errDYDZ_; } */

/* const std::vector<unsigned int>& getHitIDs() const { return hitIDs_; } */

/* // ability to store limited hit info */
/* const std::vector<float>& getHitX() const { return hitX_; } */
/* const std::vector<float>& getHitY() const { return hitY_; } */
/* const std::vector<float>& getHitZ() const { return hitZ_; } */
/* const std::vector<float>& getHitE() const { return hitE_; } */

bool operator<(const EcalCluster& rhs) const {
return this->getEnergy() < rhs.getEnergy();
}

private:
/* std::vector<unsigned int> hitIDs_; */
/* double energy_{0}; */
/* int nHits_{0}; */
/* double centroidX_{0}; */
/* double centroidY_{0}; */
/* double centroidZ_{0}; */
/* double rmsX_{0}; */
/* double rmsY_{0}; */
/* double rmsZ_{0}; */
/* double DXDZ_{0}; */
/* double DYDZ_{0}; */
/* double errDXDZ_{0}; */
/* double errDYDZ_{0}; */
/* std::vector<float> hitX_; */
/* std::vector<float> hitY_; */
/* std::vector<float> hitZ_; */
/* std::vector<float> hitE_; */

// Could add further ECal-specific info here...

ClassDef(EcalCluster, 1);
};
} // namespace ldmx
Expand Down
39 changes: 1 addition & 38 deletions src/Ecal/Event/EcalCluster.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,53 +2,16 @@

ClassImp(ldmx::EcalCluster)

namespace ldmx {
namespace ldmx {
EcalCluster::EcalCluster() {}

EcalCluster::~EcalCluster() { Clear(); }

// void EcalCluster::Print() const {
// std::cout << "EcalCluster { "
// << "Energy: " << energy_ << ", "
// << "Number of hits: " << nHits_ << " }" << std::endl;

// // for (int iHit = 0; iHit < hits_->GetEntries(); ++iHit) {
// // ldmx::EcalHit* aHit = (ldmx::EcalHit*) hits_->At(iHit);
// // std::cout << "Hit " << iHit << " : " << "with energy " <<
// // aHit->getEnergy() << std::endl;
// //}
// }

// void EcalCluster::Clear() {
// hitIDs_.clear();

// energy_ = 0;
// nHits_ = 0;
// centroidX_ = 0;
// centroidY_ = 0;
// centroidZ_ = 0;
// rmsX_ = 0;
// rmsY_ = 0;
// rmsZ_ = 0;
// DXDZ_ = 0;
// DYDZ_ = 0;
// errDXDZ_ = 0;
// errDYDZ_ = 0;
// }

void EcalCluster::addHits(const std::vector<const EcalHit *> hitsVec) {
// double clusterE = 0;
// int nHits = 0;
// double centroidX = 0;
// double centroidY = 0;
std::vector<unsigned int> vecIDs;
for (int iHit = 0; iHit < hitsVec.size(); iHit++) {
vecIDs.push_back(hitsVec[iHit]->getID());
}

// setEnergy(clusterE);
// setNHits(nHits);
setIDs(vecIDs);
// setCentroidXYZ(centroidX, centroidY, 0);
}
} // namespace ldmx

0 comments on commit 4be39bc

Please sign in to comment.