Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion TrkPatRec/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline
SOURCE
#inc/KalFinalFit_types.hh
inc/KalSeedFit_types.hh
inc/RobustHelixFinder_types.hh
inc/RobustMultiHelixFinder_types.hh
inc/TimeAndPhiClusterFinder_types.hh
Expand Down
1 change: 0 additions & 1 deletion TrkPatRec/fcl/prolog.fcl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ TrkPatRec : { @table::TrkPatRec
CaloClusterWeight : 10.0
TestFlag : true
CaloClusterMinE : 50.0
CaloClusterWeight : 10.0
T0Calculator : {}
DtMax : 25
MinNHits : 10
Expand Down
39 changes: 0 additions & 39 deletions TrkPatRec/inc/KalSeedFit_types.hh

This file was deleted.

2 changes: 1 addition & 1 deletion TrkPatRec/inc/RobustMultiHelixFinder_types.hh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace mu2e {
namespace RobustMultiHelixFinderTypes {

struct Config{
fhicl::Atom<std::string> tool_type{ fhicl::Name("tool_type"), fhicl::Comment("Needed fot backward compatibility"), "" };
fhicl::Atom<std::string> tool_type{ fhicl::Name("tool_type"), fhicl::Comment("Needed for backward compatibility"), "" };
fhicl::Atom<bool> mcDiag{ fhicl::Name("MCDiag"), fhicl::Comment("Switch to perform MC diag"), true };
fhicl::Atom<art::InputTag> strawDigiMCCollection{ fhicl::Name("StrawDigiMCCollection"), fhicl::Comment("StrawDigiMC collection name"), "makeSD" };
};
Expand Down
2 changes: 1 addition & 1 deletion TrkPatRec/inc/TimeAndPhiClusterFinder_types.hh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace mu2e {
namespace TimeAndPhiClusterFinderTypes {

struct Config{
fhicl::Atom<std::string> tool_type{ fhicl::Name("tool_type"), fhicl::Comment("Needed fot backward compatibility"), "" };
fhicl::Atom<std::string> tool_type{ fhicl::Name("tool_type"), fhicl::Comment("Needed for backward compatibility"), "" };
fhicl::Atom<bool> mcDiag{ fhicl::Name("MCDiag"), fhicl::Comment("Switch to perform MC diag"), true };
fhicl::Atom<art::InputTag> strawDigiMCCollection{ fhicl::Name("StrawDigiMCCollection"), fhicl::Comment("StrawDigiMC collection name"), "makeSD" };
};
Expand Down
3 changes: 1 addition & 2 deletions TrkPatRec/src/RobustHelixFinderDiag_tool.cc
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ namespace mu2e {
//-----------------------------------------------------------------------------
int RobustHelixFinderDiag::fillHistograms(void* Data, int Mode) {

_data = (Data_t*) Data;
_data = static_cast<Data_t*>(Data);

//-----------------------------------------------------------------------------
// fill helix-level histograms
Expand All @@ -276,7 +276,6 @@ namespace mu2e {

for (int k=0; k<nhelicities; ++k){
_hist.nseeds[k]->Fill(_data->nseeds[k]);
_hist.nseeds[k]->Fill(_data->nseeds[k]);

for (int i=0; i<_data->nseeds[k]; i++) {
_hist.nChPerPanel->Fill(_data->nChPPanel[k][i] );
Expand Down
2 changes: 0 additions & 2 deletions TrkPatRec/src/RobustMultiHelixFinderDiag_tool.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
#include "TTree.h"

#include "art/Framework/Principal/Event.h"
#include "fhiclcpp/ParameterSet.h"
#include "art/Framework/Principal/Handle.h"
#include "Offline/GeometryService/inc/GeomHandle.hh"
#include "art/Framework/Core/EDAnalyzer.h"
#include "Offline/GeometryService/inc/DetectorSystem.hh"


Expand Down
6 changes: 3 additions & 3 deletions TrkPatRec/src/RobustMultiHelixFinder_module.cc
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ namespace mu2e {
fhicl::Atom<float> maxDTHelFit {Name("MaxDTHelFit"), Comment("Maximum time difference between hit time and z-time fit") };
fhicl::Atom<float> maxChi2Hit {Name("MaxChi2Hit"), Comment("Maximum chi2 for a hit to be associated to the helix") };
fhicl::Atom<float> minDZTrk {Name("MinDZTrk"), Comment("Minimum z span of a trk") };
fhicl::Atom<std::string> fitCircleStr {Name("FitCircleStrategy"), Comment("Fit Circle algorhithm HyperFit or ChiSquared") };
fhicl::Atom<std::string> fitCircleStr {Name("FitCircleStrategy"), Comment("Fit Circle algorithm HyperFit or ChiSquared") };
fhicl::Atom<unsigned> minStrawHits {Name("MinStrawHits"), Comment("Minimum number of Straw hits for a helix candidate") };
fhicl::Atom<unsigned> nMaxTrkIter {Name("NMaxTrkIter"), Comment("Number of track finding iterations ") };
fhicl::Atom<int> diagLevel {Name("DiagLevel"), Comment("Diag level"), 0 };
Expand Down Expand Up @@ -210,7 +210,7 @@ namespace mu2e {

if (config().fitCircleStr()=="HyperFit") fitCircleStrategy_ = circleFitter::HyperFit;
else if (config().fitCircleStr()=="ChiSquared") fitCircleStrategy_ = circleFitter::ChiSquared;
else throw cet::exception("CATEGORY")<< "RobustMultiHelixFinder: unrecognixed FitCirclestrategy specified";
else throw cet::exception("CATEGORY")<< "RobustMultiHelixFinder: unrecognized FitCircleStrategy specified";
}


Expand Down Expand Up @@ -529,7 +529,7 @@ chi2dXY = bestHelix.fita_zt_;
}

//compute the rolling sum over three bins and find the maximum.
//use cyclic buffer trick to go past the end of the veccctor to correctly llok at boundaries
//use cyclic buffer trick to go past the end of the vector to correctly look at boundaries
int sumMax(0),imax(0);
for (int i=0;i<nBins+3;++i){
int sum = phiCluster[(i+nBins-1)%nBins] + phiCluster[i%nBins] + phiCluster[(i+1)%nBins];
Expand Down
2 changes: 0 additions & 2 deletions TrkPatRec/src/TimeAndPhiClusterFinderDiag_tool.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@


#include "art/Framework/Principal/Event.h"
#include "fhiclcpp/ParameterSet.h"
#include "art/Framework/Principal/Handle.h"
#include "Offline/GeometryService/inc/GeomHandle.hh"
#include "art/Framework/Core/EDAnalyzer.h"
#include "Offline/GeometryService/inc/DetectorSystem.hh"


Expand Down