Updated the name.

libo929 · Jul 19, 2020 · 13f127a · 13f127a
1 parent d13d3a2
commit 13f127a
Show file tree

Hide file tree

Showing 31 changed files with 402 additions and 2,666 deletions.
diff --git a/include/APRILCheating/PerfectFragmentRemovalAlgorithm.h b/include/APRILCheating/PerfectFragmentRemovalAlgorithm.h
@@ -1,5 +1,5 @@
 /**
- *  @file   ArborContent/include/ArborCheating/PerfectFragmentRemovalAlgorithm.h
+ *  @file   APRILContent/include/APRILCheating/PerfectFragmentRemovalAlgorithm.h
  * 
  *  @brief  Header file for the cheating clustering algorithm class.
  * 
@@ -12,7 +12,7 @@
 
 #include "Pandora/Algorithm.h"
 
-namespace arbor_content
+namespace april_content
 {
 
 /**

diff --git a/include/APRILCheating/PerfectIsoHitRemovalAlgorithm.h b/include/APRILCheating/PerfectIsoHitRemovalAlgorithm.h
@@ -1,5 +1,5 @@
 /**
- *  @file   ArborContent/include/ArborCheating/PerfectIsoHitRemovalAlgorithm.h
+ *  @file   APRILContent/include/APRILCheating/PerfectIsoHitRemovalAlgorithm.h
  * 
  *  @brief  Header file for the cheating clustering algorithm class.
  * 
@@ -12,7 +12,7 @@
 
 #include "Pandora/Algorithm.h"
 
-namespace arbor_content
+namespace april_content
 {
 
 /**

diff --git a/include/APRILCheating/PerfectNeutralHitRecoveryAlgorithm.h b/include/APRILCheating/PerfectNeutralHitRecoveryAlgorithm.h
@@ -1,5 +1,5 @@
 /**
- *  @file   ArborContent/include/ArborCheating/PerfectNeutralHitRecoveryAlgorithm.h
+ *  @file   APRILContent/include/APRILCheating/PerfectNeutralHitRecoveryAlgorithm.h
  * 
  *  @brief  Header file for the cheating clustering algorithm class.
  * 
@@ -12,7 +12,7 @@
 
 #include "Pandora/Algorithm.h"
 
-namespace arbor_content
+namespace april_content
 {
 
 /**

diff --git a/include/APRILClustering/FragmentsFromIsoHitsMergingAlgorithm.h b/include/APRILClustering/FragmentsFromIsoHitsMergingAlgorithm.h
@@ -1,21 +1,21 @@
 /**
  *
- *  @file   ArborContent/include/ArborClustering/FragmentsFromIsoHitsMergingAlgorithm.h
+ *  @file   APRILContent/include/APRILClustering/FragmentsFromIsoHitsMergingAlgorithm.h
  * 
  */
 #ifndef FRAGMENTSFROMISOHITSMERGINGALGORITHM_H
 #define FRAGMENTSFROMISOHITSMERGINGALGORITHM_H 1
 
 #include "Pandora/Algorithm.h"
-#include "ArborUtility/KDTreeLinkerAlgoT.h"
+#include "APRILUtility/KDTreeLinkerAlgoT.h"
 
 #include "TVector3.h"
 
-typedef arbor_content::KDTreeLinkerAlgo<const pandora::CaloHit*, 4> HitKDTree;
-typedef arbor_content::KDTreeNodeInfoT<const pandora::CaloHit*, 4> HitKDNode;
+typedef april_content::KDTreeLinkerAlgo<const pandora::CaloHit*, 4> HitKDTree;
+typedef april_content::KDTreeNodeInfoT<const pandora::CaloHit*, 4> HitKDNode;
 typedef map<const pandora::CaloHit*, const pandora::Cluster*> HitsToClustersMap;
 
-namespace arbor_content
+namespace april_content
 {
 
 /**

diff --git a/include/APRILClustering/IsoHitClusteringAlgorithm.h b/include/APRILClustering/IsoHitClusteringAlgorithm.h
@@ -1,5 +1,5 @@
 /**
- *  @file   ArborContent/include/ArborCheating/IsoHitClusteringAlgorithm.h
+ *  @file   APRILContent/include/APRILCheating/IsoHitClusteringAlgorithm.h
  *
  *  This algorithm is to remove part of isolated hits by clustering them
  * 
@@ -9,9 +9,9 @@
 #define ISOHITCLUSTERINGALGORITHM_H 1
 
 #include "Pandora/Algorithm.h"
-#include "ArborUtility/KDTreeLinkerAlgoT.h"
+#include "APRILUtility/KDTreeLinkerAlgoT.h"
 
-namespace arbor_content
+namespace april_content
 {
 
 /**

diff --git a/include/APRILClustering/IsoHitRemovalAlgorithm.h b/include/APRILClustering/IsoHitRemovalAlgorithm.h
@@ -1,5 +1,5 @@
 /**
- *  @file   ArborContent/include/ArborCheating/IsoHitRemovalAlgorithm.h
+ *  @file   APRILContent/include/APRILCheating/IsoHitRemovalAlgorithm.h
  * 
  *  @brief  Header file for the cheating clustering algorithm class.
  * 
@@ -11,13 +11,13 @@
 #define ISOHITREMOVALALGORITHM_H 1
 
 #include "Pandora/Algorithm.h"
-#include "ArborUtility/KDTreeLinkerAlgoT.h"
+#include "APRILUtility/KDTreeLinkerAlgoT.h"
 
-typedef arbor_content::KDTreeLinkerAlgo<const pandora::CaloHit*, 4> HitKDTree;
-typedef arbor_content::KDTreeNodeInfoT<const pandora::CaloHit*, 4> HitKDNode;
+typedef april_content::KDTreeLinkerAlgo<const pandora::CaloHit*, 4> HitKDTree;
+typedef april_content::KDTreeNodeInfoT<const pandora::CaloHit*, 4> HitKDNode;
 typedef map<const pandora::CaloHit*, const pandora::Cluster*> HitsToClustersMap;
 
-namespace arbor_content
+namespace april_content
 {
 
 /**

diff --git a/include/APRILHelpers/ClusterTrackEnergyFillingHelper.h b/include/APRILHelpers/ClusterTrackEnergyFillingHelper.h
@@ -13,7 +13,7 @@
 
 namespace pandora { class Algorithm; class CaloHit; class Track; }
 
-namespace arbor_content
+namespace april_content
 {
 	class ClusterTrackEnergyFillingHelper
 	{

diff --git a/include/APRILUtility/ClusterCheckAlgorithm.h b/include/APRILUtility/ClusterCheckAlgorithm.h
@@ -4,22 +4,22 @@
  * ClusterCheckAlgorithm.h header template automatically generated by a class generator
  * Creation date : jeu. juin 2 2016
  *
- * This file is part of ArborContent libraries.
+ * This file is part of APRILContent libraries.
  * 
- * ArborContent is free software: you can redistribute it and/or modify
+ * APRILContent is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  * based upon these libraries are permitted. Any copy of these libraries
  * must include this copyright notice.
  * 
- * ArborContent is distributed in the hope that it will be useful,
+ * APRILContent is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with ArborContent.  If not, see <http://www.gnu.org/licenses/>.
+ * along with APRILContent.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * @author Remi Ete
  * @copyright CNRS , IPNL
@@ -35,7 +35,7 @@
 #include "TNtupleD.h"
 
 
-namespace arbor_content
+namespace april_content
 {
 
 /** 
@@ -57,6 +57,7 @@ class ClusterCheckAlgorithm : public pandora::Algorithm
     pandora::StatusCode Run();
     pandora::StatusCode ReadSettings(const pandora::TiXmlHandle xmlHandle);
 	pandora::StatusCode	Initialize();
+	void                checkClusters(const pandora::ClusterList& clusterList);
 
     bool                            m_timing;
 

diff --git a/include/APRILUtility/KDTreeLinkerAlgoT.h b/include/APRILUtility/KDTreeLinkerAlgoT.h
@@ -8,11 +8,11 @@
 #ifndef LC_KD_TREE_LINKER_ALGO_TEMPLATED_H
 #define LC_KD_TREE_LINKER_ALGO_TEMPLATED_H
 
-#include "ArborUtility/KDTreeLinkerToolsT.h"
+#include "APRILUtility/KDTreeLinkerToolsT.h"
 
 #include <vector>
 
-namespace arbor_content
+namespace april_content
 {
 
 /**

diff --git a/include/APRILUtility/KDTreeLinkerToolsT.h b/include/APRILUtility/KDTreeLinkerToolsT.h
@@ -24,7 +24,7 @@ namespace pandora { class Algorithm; }
 
 //------------------------------------------------------------------------------------------------------------------------------------------
 
-namespace arbor_content
+namespace april_content
 {
 
 /**

diff --git a/include/APRILUtility/QuickUnion.h b/include/APRILUtility/QuickUnion.h
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-namespace arbor_content
+namespace april_content
 {
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ namespace pandora { class Algorithm; } @@
     //------------------------------------------------------------------------------------------------------------------------------------------
-    namespace arbor_content
+    namespace april_content
     {
     /**
@@ Expand Down @@