Skip to content

Commit

Permalink
@slava77 comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@ebrondol
ebrondol committed Jul 1, 2014
1 parent 68c5617 commit e316058
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 20 deletions.
3 changes: 2 additions & 1 deletion DataFormats/TrackerRecHit2D/interface/SiTrackerMultiRecHit.h
View file
Expand Up @@ -16,7 +16,8 @@ class SiTrackerMultiRecHit : public BaseTrackerRecHit
typedef BaseTrackerRecHit Base;
SiTrackerMultiRecHit():
theHits(),
theWeights(){}
theWeights(),
annealing_(0){}
virtual ~SiTrackerMultiRecHit(){}


Expand Down
6 changes: 3 additions & 3 deletions RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h
View file
Expand Up @@ -37,18 +37,18 @@ class SiTrackerMultiRecHitUpdator{

//calls the update method in order to build a SiTrackerMultiRecHit
virtual TransientTrackingRecHit::RecHitPointer buildMultiRecHit(const std::vector<const TrackingRecHit*>& rhv,
TrajectoryStateOnSurface tsos,
const TrajectoryStateOnSurface& tsos,
float annealing=1.) const;

//updates an existing SiTrackerMultiRecHit
//in case a different kind of rechit is passed it returns clone(tsos)
virtual TransientTrackingRecHit::RecHitPointer update( TransientTrackingRecHit::ConstRecHitPointer original,
TrajectoryStateOnSurface tsos,
const TrajectoryStateOnSurface& tsos,
double annealing=1.) const;

//returns a SiTrackerMultiRecHit out of the transient components
TransientTrackingRecHit::RecHitPointer update( TransientTrackingRecHit::ConstRecHitContainer& tcomponents,
TrajectoryStateOnSurface tsos,
const TrajectoryStateOnSurface& tsos,
double annealing=1.) const;

//computes weights or the cut-off value (depending on CutWeight variable)
Expand Down
6 changes: 3 additions & 3 deletions RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc
View file
Expand Up @@ -55,20 +55,20 @@ MultiRecHitCollectorESProducer::produce(const MultiRecHitRecord& iRecord){
std::string propagatorOppositeName = conf_.getParameter<std::string>("propagatorOpposite");
ESHandle<Propagator> propagatorOppositehandle;
iRecord.getRecord<CkfComponentsRecord>().getRecord<TrackingComponentsRecord>().get(propagatorOppositeName, propagatorOppositehandle);
_collector = boost::shared_ptr<MultiRecHitCollector>(new GroupedDAFHitCollector(measurementhandle.product(),
collector_ = boost::shared_ptr<MultiRecHitCollector>(new GroupedDAFHitCollector(measurementhandle.product(),
mrhuhandle.product(),
estimatorhandle.product(),
propagatorhandle.product(),
propagatorOppositehandle.product(), debug));
}
else {
_collector = boost::shared_ptr<MultiRecHitCollector>(new SimpleDAFHitCollector(measurementhandle.product(),
collector_ = boost::shared_ptr<MultiRecHitCollector>(new SimpleDAFHitCollector(measurementhandle.product(),
mrhuhandle.product(),
estimatorhandle.product(),
propagatorhandle.product(), debug));
}

return _collector;
return collector_;

}

Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h
View file
Expand Up @@ -26,7 +26,7 @@ class MultiRecHitCollectorESProducer: public edm::ESProducer{
void setConf(const edm::ParameterSet& conf){ conf_ = conf; }

private:
boost::shared_ptr<MultiRecHitCollector> _collector;
boost::shared_ptr<MultiRecHitCollector> collector_;
edm::ParameterSet conf_;

};
Expand Down
4 changes: 0 additions & 4 deletions RecoTracker/SiTrackerMRHTools/plugins/module.cc
View file
Expand Up @@ -3,8 +3,6 @@

#include "RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.h"
#include "RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h"
//#include "RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorMTFESProducer.h"
//#include "RecoTracker/SiTrackerMRHTools/plugins/MultiTrackFilterCollectorESProducer.h"

#include "FWCore/Framework/interface/ModuleFactory.h"
#include "FWCore/Framework/interface/ESProducer.h"
Expand All @@ -13,5 +11,3 @@

DEFINE_FWK_EVENTSETUP_MODULE(SiTrackerMultiRecHitUpdatorESProducer);
DEFINE_FWK_EVENTSETUP_MODULE(MultiRecHitCollectorESProducer);
//DEFINE_FWK_EVENTSETUP_MODULE(SiTrackerMultiRecHitUpdatorMTFESProducer);
//DEFINE_FWK_EVENTSETUP_MODULE(MultiTrackFilterCollectorESProducer);
7 changes: 2 additions & 5 deletions RecoTracker/SiTrackerMRHTools/src/GroupedDAFHitCollector.cc
View file
Expand Up @@ -13,8 +13,6 @@
#include <vector>
#include <map>

#define _debug_GroupedDAFHitCollector_

using namespace std;

vector<TrajectoryMeasurement> GroupedDAFHitCollector::recHits(const Trajectory& traj,
Expand Down Expand Up @@ -194,7 +192,7 @@ void GroupedDAFHitCollector::buildMultiRecHits(const vector<TrajectoryMeasuremen
}

LogTrace("MultiRecHitCollector") << "The best TSOS in this group is " << state << " it lays on surface located at " << state.surface().position();
#ifdef _debug_GroupedDAFHitCollector_

LogTrace("MultiRecHitCollector") << "For the MRH on this group the following hits will be used";
for (vector<const TrackingRecHit*>::iterator iter = hits.begin(); iter != hits.end(); iter++){
string validity = "valid";
Expand All @@ -206,8 +204,7 @@ void GroupedDAFHitCollector::buildMultiRecHits(const vector<TrajectoryMeasuremen
<< " surface position " << getMeasurementTracker()->geomTracker()->idToDet((*iter)->geographicalId())->position()
<< " hit local position " << (*iter)->localPosition();
}
#endif
//ERICA: Why I pass all the hits and only the TSOS of igroup->measurements().front().predictedState()

result.push_back(TrajectoryMeasurement(state,theUpdator->buildMultiRecHit(hits, state)));
}
//can this happen? it means that the measgroup was not empty but no valid measurement was found inside
Expand Down
6 changes: 3 additions & 3 deletions RecoTracker/SiTrackerMRHTools/src/SiTrackerMultiRecHitUpdator.cc
View file
Expand Up @@ -24,7 +24,7 @@ SiTrackerMultiRecHitUpdator::SiTrackerMultiRecHitUpdator(const TransientTracking


TransientTrackingRecHit::RecHitPointer SiTrackerMultiRecHitUpdator::buildMultiRecHit(const std::vector<const TrackingRecHit*>& rhv,
TrajectoryStateOnSurface tsos,
const TrajectoryStateOnSurface& tsos,
float annealing) const{
LogTrace("SiTrackerMultiRecHitUpdator") << "Calling SiTrackerMultiRecHitUpdator::buildMultiRecHit with AnnealingFactor: " << annealing;
TransientTrackingRecHit::ConstRecHitContainer tcomponents;
Expand All @@ -37,7 +37,7 @@ TransientTrackingRecHit::RecHitPointer SiTrackerMultiRecHitUpdator::buildMultiR
}

TransientTrackingRecHit::RecHitPointer SiTrackerMultiRecHitUpdator::update( TransientTrackingRecHit::ConstRecHitPointer original,
TrajectoryStateOnSurface tsos,
const TrajectoryStateOnSurface& tsos,
double annealing) const{
LogTrace("SiTrackerMultiRecHitUpdator") << "Calling SiTrackerMultiRecHitUpdator::update with AnnealingFactor: " << annealing;

Expand All @@ -61,7 +61,7 @@ TransientTrackingRecHit::RecHitPointer SiTrackerMultiRecHitUpdator::update( Tran

/*------------------------------------------------------------------------------------------------------------------------*/
TransientTrackingRecHit::RecHitPointer SiTrackerMultiRecHitUpdator::update( TransientTrackingRecHit::ConstRecHitContainer& tcomponents,
TrajectoryStateOnSurface tsos,
const TrajectoryStateOnSurface& tsos,
double annealing) const{

if (tcomponents.empty()){
Expand Down

0 comments on commit e316058

Please sign in to comment.