Skip to content

Commit

Permalink
Merge pull request #89 from dglazier/master
Browse files Browse the repository at this point in the history
purge unused iguana
  • Loading branch information
dglazier authored Dec 3, 2024
2 parents 0d04c8c + 41fcc6c commit e87b57b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 0 additions & 2 deletions RunRoot/LoadIguana.C
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ void LoadIguana(){
//external iguana linking
TString IGUANA = gSystem->Getenv("IGUANA");
gInterpreter->AddIncludePath(IGUANA+"/include");
//Some algorithms need extra paths
gInterpreter->AddIncludePath(IGUANA+"/../src/iguana/algorithms/clas12/PhotonGBTFilter/");

gROOT->ProcessLine("#include <iguana/algorithms/AlgorithmBoilerplate.h>");
gROOT->ProcessLine("#include <iguana/algorithms/AlgorithmSequence.h>");
Expand Down
15 changes: 8 additions & 7 deletions iguana/Filters.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include "IguanaAlgo.h"
#include <iguana/algorithms/clas12/ZVertexFilter/Algorithm.h>
#include <iguana/algorithms/clas12/FiducialFilter/Algorithm.h>
#include <iguana/algorithms/clas12/PhotonGBTFilter/Algorithm.h>
//#include <iguana/algorithms/clas12/FiducialFilter/Algorithm.h>
//#include <iguana/algorithms/clas12/PhotonGBTFilter/Algorithm.h>
#include <iguana/services/ConcurrentParam.h>

namespace clas12root{
Expand All @@ -14,7 +14,7 @@ namespace clas12root{
public:

iguana::clas12::ZVertexFilter* ZVertexFilter(){return _zVer.get();}
iguana::clas12::FiducialFilter* FiducialFilter(){return _Fid.get();}
// iguana::clas12::FiducialFilter* FiducialFilter(){return _Fid.get();}
//iguana::clas12::PhotonGBTFilter* PhotonGBTFilter(){return _PhotGBT.get();}

void Use(const string& name){
Expand Down Expand Up @@ -71,7 +71,7 @@ namespace clas12root{
void doZVertexFilter() const{
doFilters([this](const clas12::region_particle *p){return doZVertexFilter(p);});
}

/*
////////////////
//fiducial filter
bool doFiducialFilter(const clas12::region_particle *p) const
Expand All @@ -96,6 +96,7 @@ namespace clas12root{
void doFiducialFilter() const{
doFilters([this](const clas12::region_particle *p){return doFiducialFilter(p);});
}
*/
//////////////////
//PhotonGBT filter
/*
Expand All @@ -120,7 +121,7 @@ namespace clas12root{
void doAllFilters(){

if(_zVer.get())doZVertexFilter();
if(_Fid.get())doFiducialFilter();
// if(_Fid.get())doFiducialFilter();
// if(_PhotGBT.get())doPhotonGBTFilter();
}

Expand All @@ -138,8 +139,8 @@ namespace clas12root{
private:

std::unique_ptr<iguana::clas12::ZVertexFilter> _zVer;
std::unique_ptr<iguana::clas12::FiducialFilter> _Fid;
std::unique_ptr<iguana::clas12::PhotonGBTFilter> _PhotGBT;
//std::unique_ptr<iguana::clas12::FiducialFilter> _Fid;
//std::unique_ptr<iguana::clas12::PhotonGBTFilter> _PhotGBT;

mutable Long64_t _runNb =-1;
mutable int _concurrent_key=0;
Expand Down

0 comments on commit e87b57b

Please sign in to comment.