CMergeManager and CBoolAlgBase constructors now sets defaults for algos --dc

Author: davidc1

ClusterMerging/CMTAlgPriority/CPAlgoNHits_tool.cc

@@ -54,6 +54,8 @@ namespace cmtool {
   {
     auto nhit = cluster.size();
 
+    std::cout << "\t\t size is " << cluster.size() << std::endl;
+
     return ( nhit < _min_hits ? -1 : (float)nhit );
   }
 

ClusterMerging/CMToolBase/CBoolAlgoBase.h

@@ -27,9 +27,11 @@ namespace cmtool {
   class CBoolAlgoBase : public CMAlgoBase {
 
   public:
+
+    CBoolAlgoBase(){_merge_till_converge = false; _pair_wise = true;}
 
     /// Default destructor
-    virtual ~CBoolAlgoBase(){};
+    virtual ~CBoolAlgoBase() = default;
 
     /**
        Core function: given the CPAN input, return whether a cluster should be

ClusterMerging/CMToolBase/CMAlgoBase.h

@@ -36,7 +36,7 @@ namespace cmtool {
 
   public:
 
-    virtual ~CMAlgoBase() noexcept = default;
+    virtual ~CMAlgoBase() = default;
 
     void configure(const fhicl::ParameterSet& pset){};
 

ClusterMerging/CMToolBase/CMManagerBase.cxx

@@ -9,7 +9,7 @@ namespace cmtool {
   {
     _fout = 0;
     _debug_mode = kNone;
-    _priority_algo = nullptr;
+    //_priority_algo = nullptr;
     _min_nhits = 1;
     _merge_till_converge = false;
     Reset();
@@ -154,28 +154,37 @@ namespace cmtool {
     _priority.clear();
     _planes.clear();
 
+    std::cout << "Computing priority algo with algo " << _priority_algo->Name() 
+	      << " for " << clusters.size() << " clusters" 
+	      << std::endl;
+
     if(!clusters.size()) return;
 
     // Priority is computed cluster-by-cluster. In case of two clusters having the same priority 
     // value the one with lower cluster index gets the priority. Also, clusters with priority < 0
     // are not logged (assumed not to be used)
 
-        for(size_t i=0; i<clusters.size(); ++i) {
-    
-          size_t c_index = clusters.size() - i - 1;
-          float priority = clusters.at(c_index).size();
-
-          if(_priority_algo) {
-	    priority = _priority_algo->Priority(clusters.at(c_index));
-          }
+    for(size_t i=0; i<clusters.size(); ++i) {
+
+      size_t c_index = clusters.size() - i - 1;
+      float priority = clusters.at(c_index).size();
+      if (priority < 10) priority = -1;
+      /*
+      if(_priority_algo) {
+	std::cout << "\t calculating priority. now it is " << priority << std::endl;
+	priority = _priority_algo->Priority(clusters.at(c_index));
+      }
+      */
 
+      std::cout << "\t\t priority for cluster " << i << " is " << priority << std::endl;
+      
       if(priority>0) {
         _priority.insert(std::make_pair(priority,c_index));
-
+	
         if( _planes.find(clusters.at(c_index)._plane) == _planes.end() )
-
+	  
           _planes.insert(clusters.at(c_index)._plane);
-
+	
       }
 
     }

ClusterMerging/CMToolBase/CMergeManager.cxx

@@ -146,7 +146,9 @@ namespace cmtool {
 
 	  merge_switch.at(i) = false;
 
+      std::cout << "Computing priority over " << _tmp_merged_clusters.size() << " input clusters" << std::endl;
       ComputePriority(_tmp_merged_clusters);
+      std::cout << "there are " << _priority.size() << " pairs" << std::endl;
 
       // Run merging algorithm
       RunMerge(algo_idx,_tmp_merged_clusters, merge_switch, bk);
@@ -227,11 +229,19 @@ namespace cmtool {
 
     }
 
+    std::cout << "    \033[093m priority pairs : \033[00m  "  << _priority.size()  << std::endl;
+
     //
     // Merging
     //
+    int niter   = 0;
+    int nloop1  = 0;
+    int nloop2  = 0;
+    int ndiffpl = 0;
+    int nflag   = 0;
+    int nmerge  = 0;
 
-    int niter = 0;
+    std::cout << "pair-wise mode? " << _merge_algo_v[algo_idx]->PairWiseMode() << std::endl;
 
     // which mode? pair-wise:
     if (_merge_algo_v[algo_idx]->PairWiseMode() == true) {
@@ -240,24 +250,34 @@ namespace cmtool {
       for(auto citer1 = _priority.rbegin();
 	  citer1 != _priority.rend();
 	  ++citer1) {
-
+	
+	nloop1 += 1;
+	
 	auto citer2 = citer1;
 
 	UChar_t plane1 = in_clusters.at((*citer1).second)._plane;
 
 	while(1) {
 	  citer2++;
 	  if(citer2 == _priority.rend()) break;
+
+	  nloop2 += 1;
 
 	  // Skip if not on the same plane
 	  UChar_t plane2 = in_clusters.at((*citer2).second)._plane;
 	  if(plane1 != plane2) continue;
+
+	  ndiffpl += 1;
 
 	  // Skip if this combination is not meant to be compared
 	  if(!(merge_flag.at((*citer2).second)) && !(merge_flag.at((*citer1).second)) ) continue;
+
+	  nflag += 1;
 
 	  // Skip if this combination is not allowed to merge
 	  if(!(book_keeper.MergeAllowed((*citer1).second,(*citer2).second))) continue;
+
+	  nmerge += 1;
 
 	  if(_debug_mode <= kPerMerging){
 
@@ -292,9 +312,14 @@ namespace cmtool {
 
       } // end looping over clusters
 
-      if (_debug_mode <= kPerIteration)
-	std::cout << "    \033[093m pair-wise comparisons : \033[00m  "  << niter << std::endl;
-
+      if (_debug_mode <= kPerIteration){
+	std::cout << "    \033[093m pair-wise comparisons : \033[00m  "  << niter  << std::endl;
+	std::cout << "    \033[093m loop1 iterations      : \033[00m  "  << nloop1 << std::endl;
+	std::cout << "    \033[093m loop2 iterations      : \033[00m  "  << nloop2 << std::endl;
+	std::cout << "    \033[093m ndiffplane            : \033[00m  "  << ndiffpl << std::endl;
+	std::cout << "    \033[093m nflag                 : \033[00m  "  << nflag << std::endl;
+	std::cout << "    \033[093m nmerge                : \033[00m  "  << nmerge << std::endl;
+      }
     }// if pair-wise mode
 
 
@@ -334,7 +359,7 @@ namespace cmtool {
 
   }
 
-  void CMergeManager::ReportAlgoChain() {
+    void CMergeManager::ReportAlgoChain() {
 
     std::cout << "\t\t" << std::endl;
     std::cout << "\t\t *****************" << std::endl;

ClusterMerging/CMToolBase/CPriorityAlgoBase.h

@@ -26,6 +26,8 @@ namespace cmtool {
   class CPriorityAlgoBase : public CMAlgoBase {
 
   public:
+
+    CPriorityAlgoBase(){}
 
     /// Default destructor
     virtual ~CPriorityAlgoBase(){};

ClusterMerging/ClusterMerger_module.cc

@@ -125,7 +125,7 @@ ClusterMerger::ClusterMerger(fhicl::ParameterSet const & pset)
     std::cout << "DD \t done adding algo" << std::endl;
   }// for all algorithms to be added
 
-  _merge_helper->GetManager().ReportAlgoChain();
+  _omerge_helper->GetManager().ReportAlgoChain();
 
   produces<std::vector<recob::Cluster> >();
   produces<art::Assns <recob::Cluster, recob::Hit> >();