Merge pull request #19 from benedikt-voelkel/clang-format

introduce clang-format

Author: benedikt-voelkel

.clang-format

@@ -18,13 +18,14 @@ CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 2
-Cpp11BracedListStyle: false
+Cpp11BracedListStyle: true
 DerivePointerBinding: false
 ExperimentalAutoDetectBinPacking: false
 IndentCaseLabels: true
 IndentFunctionDeclarationAfterType: true
 IndentWidth:     2
 # It is broken on windows. Breaks all #include "header.h"
+---
 Language:        Cpp
 MaxEmptyLinesToKeep: 1
 KeepEmptyLinesAtTheStartOfBlocks: true
@@ -49,3 +50,7 @@ SpacesInParentheses: false
 Standard:        Cpp11
 TabWidth:        2
 UseTab:          Never
+---
+# Do not format protobuf files
+Language: Proto
+DisableFormat: true

.github/workflows/format.yml

@@ -0,0 +1,38 @@
+name: Clang format
+
+on: [pull_request]
+
+jobs:
+  clang-format:
+    # We need at least 20.04 to install clang-format-11.
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Install prerequisites
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          sudo apt update -y
+          sudo apt install -y clang-format-11
+          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 100
+          sudo update-alternatives --install /usr/bin/git-clang-format git-clang-format /usr/bin/git-clang-format-11 100
+      - name: Run clang-foramt on changed files
+        run: |
+          set -x
+          git fetch origin ${{ github.event.pull_request.base.ref }}
+          git fetch origin pull/${{ github.event.pull_request.number }}/head:${{ github.event.pull_request.head.ref }}
+          BASE_COMMIT=$(git rev-parse ${{ github.event.pull_request.base.sha }})
+          COMMIT_FILES=$(git diff --diff-filter=d --name-only ${BASE_COMMIT} | grep -E -- '\.cxx|\.h' | grep -i -v LinkDef) || true ;# avoid failures if nothing is greped
+          [ "X$COMMIT_FILES" = X ] && { echo "No files to check" ; exit 0; }
+          RESULT_OUTPUT=$(git-clang-format --commit ${BASE_COMMIT} --diff ${COMMIT_FILES})
+          if [ "$RESULT_OUTPUT" == "no modified files to format" ] || [ "$RESULT_OUTPUT" == "clang-format did not modify any files" ]; then
+            echo "clang-format passed."
+            exit 0
+          else
+            git-clang-format --commit $BASE_COMMIT --diff
+            echo "$RESULT_OUTPUT"
+            echo "clang-format failed."
+            exit 1
+          fi

.travis.yml

@@ -39,7 +39,6 @@ namespace mcstepanalysis
 // here we will give Step + meta info such as volumename, modulename, pdg
 typedef bool (*cut_function_type)(StepInfo const&, std::string const&, std::string const&, int, o2::StepLookups*);
 
-
 // /class MCAnalysisManager;
 
 class MCAnalysis

include/MCStepLogger/MCAnalysis.h

@@ -32,6 +32,6 @@ void scalePerBin(TH1* histo, const std::vector<float>& scaleVector);
 /// for histograms with alphanumeric labels scale bin with name "name" by scaleMap["name"]
 void scalePerBin(TH1* histo, const std::unordered_map<std::string, float>& scaleMap);
 } // namespace utilities
-} // namespace mstepanalysis
-} // o2
+} // namespace mcstepanalysis
+} // namespace o2
 #endif /* MCANALYSIS_UTILITIES_H_ */

include/MCStepLogger/MCAnalysisUtilities.h

@@ -29,7 +29,7 @@ const std::string defaultMCAnalysisName = "defaultMCAnalysisName";
 const std::string defaultLabel = "defaultLabel";
 const std::string defaultStepLoggerTTreeName = "StepLoggerTree";
 
-} // end namespace metainfonames
+} // namespace defaults
 
 struct MCAnalysisMetaInfo {
   MCAnalysisMetaInfo()

include/MCStepLogger/MetaInfo.h

@@ -85,8 +85,8 @@ class SimpleStepAnalysis : public MCAnalysis
   TH2D* histXY;
 
   // keep steps (under cutting for instance)
-  TTree *steptree;
-  TFile *stepfile;
+  TTree* steptree;
+  TFile* stepfile;
 
   // pointing to a user cut function
   cut_function_type* mUserCutFunction = nullptr; //!

include/MCStepLogger/SimpleStepAnalysis.h

@@ -57,14 +57,14 @@ struct StepLookups {
   std::vector<std::string*> volidtovolname;
   std::vector<std::string*> volidtomodule;
   std::vector<std::string*> volidtomedium;
-  std::vector<bool>         volidtoissensitive; // keep track of which volume is sensitive
+  std::vector<bool> volidtoissensitive; // keep track of which volume is sensitive
   std::vector<int> tracktopdg;
   std::vector<int> tracktoparent; // when parent is -1 we mean primary
   std::vector<int> stepcounterpertrack;
 
-  std::vector<int> trackorigin;      // the volumeID where the track originates
-  std::vector<float> tracktoenergy;  // mapping of trackID to the track energy
-  std::vector<bool> crossedboundary; // if track every crossed a geometry boundary
+  std::vector<int> trackorigin;        // the volumeID where the track originates
+  std::vector<float> tracktoenergy;    // mapping of trackID to the track energy
+  std::vector<bool> crossedboundary;   // if track every crossed a geometry boundary
   std::vector<bool> producedsecondary; // if track ever produced a secondary
 
   void insertVolName(int index, std::string const& s) { insertValueAt(index, s, volidtovolname); }
@@ -89,34 +89,38 @@ struct StepLookups {
     tracktopdg[trackindex] = pdg;
   }
 
-  void incStepCount(int trackindex) {
+  void incStepCount(int trackindex)
+  {
     if (trackindex >= stepcounterpertrack.size()) {
       stepcounterpertrack.resize(trackindex + 1, 0);
     }
     stepcounterpertrack[trackindex]++;
   }
 
-  void setProducedSecondary(int trackindex, bool b) {
+  void setProducedSecondary(int trackindex, bool b)
+  {
     if (trackindex >= producedsecondary.size()) {
       producedsecondary.resize(trackindex + 1, false);
     }
-    producedsecondary[trackindex]=b;
+    producedsecondary[trackindex] = b;
   }
 
-  void setCrossedBoundary(int trackindex, bool b) {
+  void setCrossedBoundary(int trackindex, bool b)
+  {
     if (trackindex >= crossedboundary.size()) {
       crossedboundary.resize(trackindex + 1, false);
     }
-    crossedboundary[trackindex]=b;
+    crossedboundary[trackindex] = b;
   }
 
-  void setTrackEnergy(int trackindex, float e) {
+  void setTrackEnergy(int trackindex, float e)
+  {
     if (trackindex >= tracktoenergy.size()) {
       tracktoenergy.resize(trackindex + 1, -1.);
     }
     // only take the starting energy
-    if (tracktoenergy[trackindex]==-1.) {
-      tracktoenergy[trackindex]=e;
+    if (tracktoenergy[trackindex] == -1.) {
+      tracktoenergy[trackindex] = e;
     }
   }
 
@@ -143,7 +147,8 @@ struct StepLookups {
     tracktoparent[trackindex] = parent;
   }
 
-  void clearTrackLookups() {
+  void clearTrackLookups()
+  {
     tracktoparent.clear();
     producedsecondary.clear();
     crossedboundary.clear();
@@ -192,13 +197,13 @@ struct StepInfo {
   float step = 0.;
   float maxstep = 0.;
   int nsecondaries = 0;
-  int prodprocess = -1;   // prod process of current track
-  int nprocessesactive = 0;          // number of active processes
-  bool stopped = false;              // if track was stopped during last step
-  bool entered = false;              // if track entered volume during last step
-  bool exited = false;               // if track exited volume during last step
-  bool newtrack = false;             // if track is new
-  bool insensitiveRegion = false;    // whether step done in sensitive region
+  int prodprocess = -1;           // prod process of current track
+  int nprocessesactive = 0;       // number of active processes
+  bool stopped = false;           // if track was stopped during last step
+  bool entered = false;           // if track entered volume during last step
+  bool exited = false;            // if track exited volume during last step
+  bool newtrack = false;          // if track is new
+  bool insensitiveRegion = false; // whether step done in sensitive region
 
   const char* getProdProcessAsString() const;
 
@@ -227,5 +232,5 @@ struct MagCallInfo {
   static int stepcounter;
   ClassDefNV(MagCallInfo, 1);
 };
-}
+} // namespace o2
 #endif

include/MCStepLogger/StepInfo.h

@@ -9,7 +9,6 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-
 #ifdef __CLING__
 #pragma link off all globals;
 #pragma link off all classes;

src/MCStepLoggerAnalysisLinkDef.h

@@ -9,21 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-
 #ifdef __CLING__
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class o2::StepInfo+;
-#pragma link C++ class o2::MagCallInfo+;
-#pragma link C++ class std::vector<o2::StepInfo>+;
-#pragma link C++ class std::vector<o2::MagCallInfo>+;
-#pragma link C++ class std::vector<o2::StepInfo*>+;
-#pragma link C++ class std::vector<o2::MagCallInfo*>+;
-#pragma link C++ class std::vector<TGeoVolume const *>+;
-#pragma link C++ class std::vector<std::vector<TGeoVolume const *> *>+;
-#pragma link C++ class o2::VolInfoContainer+;
-#pragma link C++ class o2::StepLookups+;
+#pragma link C++ class o2::StepInfo + ;
+#pragma link C++ class o2::MagCallInfo + ;
+#pragma link C++ class std::vector < o2::StepInfo> + ;
+#pragma link C++ class std::vector < o2::MagCallInfo> + ;
+#pragma link C++ class std::vector < o2::StepInfo*> + ;
+#pragma link C++ class std::vector < o2::MagCallInfo*> + ;
+#pragma link C++ class std::vector < TGeoVolume const*> + ;
+#pragma link C++ class std::vector < std::vector < TGeoVolume const*>*> + ;
+#pragma link C++ class o2::VolInfoContainer + ;
+#pragma link C++ class o2::StepLookups + ;
 
 #endif