Merge pull request #30 from alicerobson/newheaders

Newheaders
HEP-FCC · Apr 7, 2017 · 586c877 · 586c877
2 parents fcb2018 + 7e17749
commit 586c877
Show file tree

Hide file tree

Showing 93 changed files with 224 additions and 465 deletions.
diff --git a/examples/example_dag_pair.cpp b/examples/example_dag_pair.cpp
@@ -1,5 +1,7 @@
 #include "papas/graphtools/DirectedAcyclicGraph.h"
 
+#include <iostream>
+
 class idpair {
 public:
   int itype;

diff --git a/papas/datatypes/Cluster.h b/papas/datatypes/Cluster.h
@@ -1,12 +1,15 @@
 #ifndef Cluster_h
 #define Cluster_h
 
-#include "TVector3.h"
 #include "papas/datatypes/Definitions.h"
-#include "papas/datatypes/IdCoder.h"
+
 #include <list>
 #include <stdio.h>
 
+#include "TVector3.h"
+
+#include "papas/datatypes/IdCoder.h"
+
 namespace papas {
 
 /** @brief The Cluster class can be used with raw, smeared and merged clusters.

diff --git a/papas/datatypes/Definitions.h b/papas/datatypes/Definitions.h
@@ -1,11 +1,3 @@
-//
-//  Definitions.h
-//  papas
-//
-//  Created by Alice Robson on 12/05/16.
-//
-//
-
 #ifndef Definitions_h
 #define Definitions_h
 

diff --git a/papas/datatypes/DefinitionsCollections.h b/papas/datatypes/DefinitionsCollections.h
@@ -1,18 +1,8 @@
-//
-//  DefinitionsCollections.h
-//
-//  Created by Alice Robson on 26/05/16.
-//
-//
-
 #ifndef DefinitionsCollections_h
 #define DefinitionsCollections_h
 
-#include "papas/datatypes/Cluster.h"
 #include "papas/datatypes/IdCoder.h"
-#include "papas/datatypes/Particle.h"
-#include "papas/datatypes/Track.h"
-#include "papas/graphtools/Edge.h"
+
 #include <list>
 #include <unordered_map>
 #if WITHSORT
@@ -31,9 +21,9 @@ class Particle;
 typedef std::list<Particle> ListParticles;                   ///< list of Particles
 typedef std::unordered_map<unsigned long long, Edge> Edges;  ///< collection of Edge objects
 #if WITHSORT
-typedef std::set<Identifier, std::greater<Identifier>> Ids;  ///< collection containing Id objects
+typedef std::set<Identifier, std::greater<Identifier>> Ids;  ///< set containing Identifiers
 #else
-typedef std::unordered_set<Identifier> Ids;  ///< collection containing Id objects
+typedef std::unordered_set<Identifier> Ids;  ///< set containing Identifiers
 #endif
 typedef std::unordered_map<Identifier, Track> Tracks;        ///< collection containing Track objects
 typedef std::unordered_map<Identifier, PFBlock> Blocks;      ///< collection containing Block objects

diff --git a/papas/datatypes/Event.h b/papas/datatypes/Event.h
@@ -1,12 +1,22 @@
 #ifndef Event_h
 #define Event_h
 
+#include "papas/datatypes/Cluster.h"
 #include "papas/datatypes/DefinitionsCollections.h"
 #include "papas/datatypes/IdCoder.h"
+#include "papas/datatypes/Particle.h"
+#include "papas/datatypes/Track.h"
 #include "papas/graphtools/DefinitionsNodes.h"
 #include "papas/reconstruction/PFBlock.h"
 
+#include <memory>
+#include <string>
+#include <unordered_map>
+
 namespace papas {
+
+  class Cluster;
+
 /**
  *  @brief The Event stores pointers to collections of Clusters, Tracks, Blocks, Particles in its
  *  internal ClusterCollections, Track Collections etc. It also contains a shared pointer to a  history object

diff --git a/papas/datatypes/Helix.h b/papas/datatypes/Helix.h
@@ -1,10 +1,3 @@
-//
-//  Helix.hpp
-//
-//  Created by Alice Robson on 11/05/16.
-//
-//
-
 #ifndef Helix_h
 #define Helix_h
 

diff --git a/papas/datatypes/HistoryHelper.h b/papas/datatypes/HistoryHelper.h
@@ -2,11 +2,13 @@
 #define HistoryHelper_h
 
 #include "papas/datatypes/DefinitionsCollections.h"
-#include "papas/datatypes/Event.h"
 #include "papas/datatypes/IdCoder.h"
 #include "papas/graphtools/DirectedAcyclicGraph.h"
 
 namespace papas {
+
+// forward declarations
+class Event;
 /**
  *  @brief The HistoryHelper is used to access history information stored in a Event.
  *  The Event contains history information eg which clusters and tracks were used

diff --git a/papas/datatypes/IdCoder.h b/papas/datatypes/IdCoder.h
@@ -2,6 +2,7 @@
 #define IdCoder_h
 
 #include "papas/datatypes/Definitions.h"
+
 #include <inttypes.h>
 #include <iostream>
 

diff --git a/papas/datatypes/Particle.h b/papas/datatypes/Particle.h
@@ -1,18 +1,17 @@
-//
-//  Created by Alice Robson on 29/11/15.
-//
-//
 #ifndef PARTICLE_H
 #define PARTICLE_H
 
+#include "papas/datatypes/Definitions.h"
+
+#include <memory>
+
 #include "TLorentzVector.h"
 #include "TVector3.h"
-#include "papas/datatypes/Definitions.h"
-#include "papas/datatypes/Path.h"
-#include "papas/utility/PDebug.h"
-class Track;
 
 namespace papas {
+
+// Forward declarations
+class Path;
 /// Main Particle class
 ///
 /// Contains 4-momentum vector, particle id and accessor functions

diff --git a/papas/datatypes/ParticlePData.h b/papas/datatypes/ParticlePData.h
@@ -1,11 +1,3 @@
-//
-//  particledata.h
-//  fastsim
-//
-//  Created by Alice Robson on 13/01/16.
-//
-//
-
 #ifndef particledata_h
 #define particledata_h
 

diff --git a/papas/datatypes/Path.h b/papas/datatypes/Path.h
@@ -1,16 +1,12 @@
-//
-//  Created by Alice Robson on 02/12/15.
-//
-//
 #ifndef path_h
 #define path_h
 
+#include <map>
+
 #include "TLorentzVector.h"
 #include "TVector3.h"
+
 #include "papas/datatypes/Definitions.h"
-#include <map>
-#include <memory>
-#include <vector>
 
 namespace papas {
 

diff --git a/papas/datatypes/Track.h b/papas/datatypes/Track.h
@@ -1,11 +1,15 @@
 #ifndef PAPAS_TRACK_H
 #define PAPAS_TRACK_H
 
-#include "TLorentzVector.h"
+#include "papas/datatypes/Definitions.h"
+
 #include "TVector3.h"
-#include "papas/datatypes/Path.h"
+
+#include <memory>
 
 namespace papas {
+
+class Path;
 /** @brief Determines the trajectory in space and time of a particle (charged or neutral).
 
 attributes:

diff --git a/papas/datatypes/src/Cluster.cpp b/papas/datatypes/src/Cluster.cpp
@@ -1,16 +1,9 @@
-//
-//  Cluster.cpp
-//  papas
-//
-//  Created by Alice Robson on 28/04/16.
-//
-//
-
 #include "papas/datatypes/Cluster.h"
-#include "papas/datatypes/IdCoder.h"
-#include "papas/utility/StringFormatter.h"
+
 #include <iomanip>
 
+#include "papas/utility/StringFormatter.h"
+
 namespace papas {
 
 double Cluster::s_maxEnergy = 0;

diff --git a/papas/datatypes/src/Event.cpp b/papas/datatypes/src/Event.cpp
@@ -1,9 +1,5 @@
 #include "papas/datatypes/Event.h"
 #include "papas/datatypes/Cluster.h"
-#include "papas/datatypes/Particle.h"
-#include "papas/datatypes/Track.h"
-#include "papas/reconstruction/PFBlock.h"
-#include <stdio.h>
 
 namespace papas {
 /// Event holds pointers to collections of particles, clusters etc and the address of the history associated with

diff --git a/papas/datatypes/src/Helix.cpp b/papas/datatypes/src/Helix.cpp
@@ -1,16 +1,9 @@
-//
-//  Helix.cpp
-//  papas
-//
-//  Created by Alice Robson on 11/05/16.
-//
-//
-
 #include "papas/datatypes/Helix.h"
-#include "papas/datatypes/Definitions.h"
-#include "papas/utility/DeltaR.h"
+
 #include <array>
 
+#include "papas/utility/DeltaR.h"
+
 namespace papas {
 extern double gconstc;
 

diff --git a/papas/datatypes/src/HistoryHelper.cpp b/papas/datatypes/src/HistoryHelper.cpp
@@ -1,7 +1,6 @@
-
 #include "papas/datatypes/HistoryHelper.h"
+
 #include "papas/datatypes/Event.h"
-#include "papas/graphtools/DirectedAcyclicGraph.h"
 
 namespace papas {
 

diff --git a/papas/datatypes/src/IdCoder.cpp b/papas/datatypes/src/IdCoder.cpp
@@ -1,11 +1,13 @@
 #include "papas/datatypes/IdCoder.h"
-#include "papas/utility/StringFormatter.h"
+
 #include <assert.h>
 #include <bitset>
 #include <cmath>
 #include <inttypes.h>
 #include <iostream>
 
+#include "papas/utility/StringFormatter.h"
+
 //
 // Encode information into an identifier
 //

diff --git a/papas/datatypes/src/Particle.cpp b/papas/datatypes/src/Particle.cpp
@@ -1,15 +1,10 @@
 #include "papas/datatypes/Particle.h"
 
-/**
- * @brief  Particle from which more complex particles are derived
- */
+#include <iomanip> //lxplus needs this
+#include <iostream>
 
-#include "papas/datatypes/Definitions.h"
-#include "papas/datatypes/Helix.h"
 #include "papas/datatypes/IdCoder.h"
 #include "spdlog/details/format.h"
-#include <iomanip>
-#include <iostream>
 
 namespace papas {
 

diff --git a/papas/datatypes/src/ParticlePData.cpp b/papas/datatypes/src/ParticlePData.cpp
@@ -1,12 +1,5 @@
-//
-//  ParticlePData.cpp
-//  papas
-//
-//  Created by Alice Robson on 11/05/16.
-//
-//
-
 #include "papas/datatypes/ParticlePData.h"
+
 namespace papas {
 
 const double ParticlePData::m_e = 0.000511;

diff --git a/papas/datatypes/src/Path.cpp b/papas/datatypes/src/Path.cpp
@@ -1,12 +1,5 @@
-//
-//  path.cpp
-//  fastsim_cmake
-//
-//  Created by Alice Robson on 02/12/15.
-//
-//
-
 #include "papas/datatypes/Path.h"
+
 #include <iostream>
 
 namespace papas {

diff --git a/papas/datatypes/src/Track.cpp b/papas/datatypes/src/Track.cpp
@@ -1,9 +1,11 @@
-
 #include "papas/datatypes/Track.h"
-#include "papas/datatypes/IdCoder.h"
-#include "papas/utility/PDebug.h"
+
+#include <iostream>
 #include <iomanip>
 
+#include "papas/datatypes/IdCoder.h"
+#include "papas/utility/StringFormatter.h"
+
 namespace papas {
 
 Track::Track(const TVector3& p3, double charge, const std::shared_ptr<Path> path, unsigned int index, char subtype)

diff --git a/papas/detectors/CMS.h b/papas/detectors/CMS.h
@@ -1,14 +1,7 @@
-//
-//  Created by Alice Robson on 29/11/15.
-//
-//
 #ifndef CMS_H
 #define CMS_H
 
 #include "papas/detectors/Detector.h"
-#include <memory>
-#include <string>
-#include <vector>
 
 namespace papas {
 

diff --git a/papas/detectors/CMSEcal.h b/papas/detectors/CMSEcal.h
@@ -1,11 +1,8 @@
-//
-//  Created by Alice Robson on 29/11/15.
-//
-//
 #ifndef CMSECAL_H
 #define CMSECAL_H
 
 #include "papas/detectors/Calorimeter.h"
+
 #include <vector>
 
 namespace papas {

diff --git a/papas/detectors/CMSField.h b/papas/detectors/CMSField.h
@@ -1,14 +1,11 @@
-//
-//  Created by Alice Robson on 29/11/15.
-//
-//
 #ifndef CMSFIELD_H
 #define CMSFIELD_H
 
 #include "papas/detectors/Field.h"
 
 namespace papas {
 
+// Forward declaration
 class VolumeCylinder;
 /// CMS specific implementation of Detector Field element
 ///

diff --git a/papas/detectors/CMSHcal.h b/papas/detectors/CMSHcal.h
@@ -1,11 +1,8 @@
-//
-//  Created by Alice Robson on 29/11/15.
-//
-//
 #ifndef CMSHCAL_H
 #define CMSHCAL_H
 
 #include "papas/detectors/Calorimeter.h"
+
 #include <vector>
 
 namespace papas {