Merge branch 'main' into jgt/easywave

Author: Jason G. Tong

.gitattributes

@@ -0,0 +1 @@
+*.tgz filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -0,0 +1,66 @@
+# Created by https://www.gitignore.io/api/c++
+
+### C++ ###
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+/*/*/*/qs
+
+# Vim swap
+*.swp
+
+# This is a comment
+# Ignore target at the top level
+/build/
+/Build/
+/bin/
+/Bin/
+# Ignore child project's targets as well
+/*/build/
+/*/Build/
+/*/bin/
+/*/Bin/
+
+# And any grandchildren ...
+/*/*/build/
+/*/*/Build/
+/*/*/bin/
+/*/*/Bin/
+
+# Or you can do:
+*build*/
+*Build*/
+*bin*/
+*Bin*/
+
+# which matches 'target' in any sub folder
+*.syntastic_cpp_config

QuickSilver/CUDA/src/.depend

@@ -2,20 +2,20 @@
 #define ENERGYSPECTRUM_HH
 #include <string>
 #include <vector>
+#include <cstdint>
 
 class MonteCarlo;
 
 class EnergySpectrum
 {
-    public:
-        EnergySpectrum(std::string name, uint64_t size) : _fileName(std::move(name)), _censusEnergySpectrum(size,0) {};
-        void UpdateSpectrum(MonteCarlo* monteCarlo);
-        void PrintSpectrum(MonteCarlo* monteCarlo);
+public:
+    EnergySpectrum(std::string name, uint64_t size) : _fileName(std::move(name)), _censusEnergySpectrum(size, 0){};
+    void UpdateSpectrum(MonteCarlo *monteCarlo);
+    void PrintSpectrum(MonteCarlo *monteCarlo);
 
-    private:
-        std::string _fileName;
-        std::vector<uint64_t> _censusEnergySpectrum;
+private:
+    std::string _fileName;
+    std::vector<uint64_t> _censusEnergySpectrum;
 };
 
 #endif
-