Skip to content

Commit

Permalink
cleaning up - second part
Browse files Browse the repository at this point in the history
  • Loading branch information
ebrondol committed Jun 25, 2014
1 parent 552edeb commit 68c5617
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 24 deletions.
2 changes: 1 addition & 1 deletion RecoTracker/TrackProducer/plugins/TrackRefitter.cc
Expand Up @@ -75,7 +75,7 @@ void TrackRefitter::produce(edm::Event& theEvent, const edm::EventSetup& setup)
edm::Handle<reco::TrackCollection> theTCollection;
getFromEvt(theEvent,theTCollection,bs);

// std::cout << "TrackRefitter::produce(none):Number of Trajectories:" << (*theTCollection).size() <<std::endl;
LogDebug("TrackRefitter") << "TrackRefitter::produce(none):Number of Trajectories:" << (*theTCollection).size();

if (theTCollection.failedToGet()){
edm::LogError("TrackRefitter")<<"could not get the reco::TrackCollection."; break;}
Expand Down
Expand Up @@ -16,7 +16,7 @@ std::pair<bool, double> MRHChi2MeasurementEstimator::estimate(const TrajectorySt
case 2: return estimate<2>(tsos,aRecHit);
//avoid the not-2D hit due to the final sum
case ( 1 || 3 || 4 || 5 ):{
// std::cout << "WARNING:The hit is not 2D: does not count in the MRH Chi2 estimation." << std::endl;
LogDebug("MRHChi2MeasurementEstimator") << "WARNING:The hit is not 2D: does not count in the MRH Chi2 estimation." ;
double est = 0.0;
return HitReturnType(false, est);
}
Expand Down
1 change: 0 additions & 1 deletion TrackingTools/PatternTools/interface/TrajAnnealing.h
Expand Up @@ -23,7 +23,6 @@ class TrajAnnealing

TrajAnnealing( Trajectory, float );

void Debug() const;
float getAnnealing() const { return annealing_; }
Trajectory getTraj() const { return traj_; }

Expand Down
21 changes: 0 additions & 21 deletions TrackingTools/PatternTools/src/TrajAnnealing.cc
Expand Up @@ -24,31 +24,10 @@ TrajAnnealing::TrajAnnealing( Trajectory traj, float ann ){
}
}

void TrajAnnealing::Debug() const{

std::vector<TrajectoryMeasurement> measurements = traj_.measurements();
std::vector<TrajectoryMeasurement> vmeas = traj_.measurements();
std::vector<TrajectoryMeasurement>::reverse_iterator imeas;

//I run inversely on the trajectory obtained and update the state
for (imeas = vmeas.rbegin(); imeas != vmeas.rend(); imeas++){
if (imeas->recHit()->isValid()){
SiTrackerMultiRecHit const & mHit = dynamic_cast<SiTrackerMultiRecHit const &>(*imeas->recHit());
std::vector<const TrackingRecHit*> components = mHit.recHits();
int iComp = 0;
std::cout << "Annealing: " << mHit.getAnnealingFactor();
for(std::vector<const TrackingRecHit*>::const_iterator iter2 = components.begin(); iter2 != components.end(); iter2++, iComp++){
std::cout << "\tHit weight in mrh " << mHit.weight(iComp) << "\t";
}
}
}
}

std::pair<float, std::vector<float> > TrajAnnealing::getAnnealingWeight( const TrackingRecHit& aRecHit ) const {

if (!aRecHit.isValid()) {
std::vector<float> dumpyVec = {0.0};
// std::cout << "Invalid RecHit passed " << std::endl;
return make_pair(0.0,dumpyVec);
}

Expand Down

0 comments on commit 68c5617

Please sign in to comment.