Merge branch 'master' of gitlab.ikp.kit.edu:AirShowerPhysics/corsika

Processes/CMakeLists.txt

+
 add_subdirectory (NullModel)
 #add_subdirectory (Sibyll)
 add_subdirectory (StackInspector)
+
+#add_custom_target(CORSIKAprocesses)
+add_library (CORSIKAprocesses INTERFACE)
+add_dependencies(CORSIKAprocesses ProcessNullModel)
+add_dependencies(CORSIKAprocesses ProcessSibyll)
+add_dependencies(CORSIKAprocesses ProcessStackInspector)

Processes/NullModel/NullModel.cc

+
+/**
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #include <corsika/process/null_model/NullModel.h>
 
 using namespace corsika::process::null_model;

Processes/NullModel/NullModel.h

+
+/**
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #ifndef _Physics_NullModel_NullModel_h_
 #define _Physics_NullModel_NullModel_h_
 

Processes/NullModel/testNullModel.cc

+
+/**
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
                           // cpp file
 #include <catch2/catch.hpp>

Processes/Sibyll/ParticleConversion.cc

+
+/**
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/sibyll/ParticleConversion.h>
 

Processes/Sibyll/ParticleConversion.h

+
+/**
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #ifndef _include_processes_sibyll_particles_h_
 #define _include_processes_sibyll_particles_h_
 

Processes/Sibyll/testSibyll.cc

 
+/**
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/process/sibyll/ParticleConversion.h>
 #include <corsika/units/PhysicalUnits.h>

Processes/StackInspector/CMakeLists.txt

@@ -29,6 +29,7 @@ set_target_properties (
 target_link_libraries (
   ProcessStackInspector
   CORSIKAunits
+  CORSIKAsetup
   )
 
 target_include_directories (
@@ -52,7 +53,6 @@ add_executable (testStackInspector testStackInspector.cc)
 
 target_link_libraries (
   testStackInspector
-  CORSIKAgeometry
   CORSIKAunits
   CORSIKAthirdparty # for catch2
   )

Processes/StackInspector/StackInspector.cc

 #include <corsika/process/stack_inspector/StackInspector.h>
+#include <corsika/units/PhysicalUnits.h>
 
+#include <iostream>
+using namespace std;
+
+using namespace corsika;
+using namespace corsika::units::si;
 using namespace corsika::process::stack_inspector;
 
-StackInspector::StackInspector() {}
+template <typename Stack, typename Trajectory>
+StackInspector<Stack, Trajectory>::StackInspector(const bool aReport)
+    : fReport(aReport) {}
+
+template <typename Stack, typename Trajectory>
+StackInspector<Stack, Trajectory>::~StackInspector() {}
+
+template <typename Stack, typename Trajectory>
+process::EProcessReturn StackInspector<Stack, Trajectory>::DoContinuous(Particle&,
+                                                                        Trajectory&,
+                                                                        Stack& s) const {
+
+  // using namespace corsika::particles::io;
+
+  static int countStep = 0;
+  if (!fReport) return EProcessReturn::eOk;
+  // std::cout << "generation  " << countStep << std::endl;
+  [[maybe_unused]] int i = 0;
+  EnergyType Etot = 0_GeV;
+  for (auto& iterP : s) {
+    EnergyType E = iterP.GetEnergy();
+    Etot += E;
+    // std::cout << " particle data: " << i++ << ", id=" << iterP << " | " << std::endl;
+  }
+  countStep++;
+  // cout << "#=" << countStep << " " << s.GetSize() << " " << Etot/1_GeV << endl;
+  cout << countStep << " " << s.GetSize() << " " << Etot / 1_GeV << " " << endl;
+  return EProcessReturn::eOk;
+}
+
+template <typename Stack, typename Trajectory>
+double StackInspector<Stack, Trajectory>::MinStepLength(Particle&) const {
+  return 0;
+}
 
-StackInspector::~StackInspector() {}
+template <typename Stack, typename Trajectory>
+void StackInspector<Stack, Trajectory>::DoDiscrete(Particle&, Stack&) const {}
 
-void StackInspector::init() {}
+template <typename Stack, typename Trajectory>
+void StackInspector<Stack, Trajectory>::Init() {}
 
-void StackInspector::run() {}
+#include <corsika/setup/SetupStack.h>
+#include <corsika/setup/SetupTrajectory.h>
 
-double StackInspector::GetStepLength() { return 0; }
+template class corsika::process::stack_inspector::StackInspector<setup::Stack,
+                                                                 setup::Trajectory>;

Processes/StackInspector/StackInspector.h

 #ifndef _Physics_StackInspector_StackInspector_h_
 #define _Physics_StackInspector_StackInspector_h_
 
+#include <corsika/process/ProcessSequence.h>
+
 namespace corsika::process {
 
   namespace stack_inspector {
 
-    class StackInspector {
+    template <typename Stack, typename Trajectory>
+    class StackInspector
+        : public corsika::process::BaseProcess<StackInspector<Stack, Trajectory>> {
+
+      typedef typename Stack::ParticleType Particle;
 
     public:
-      StackInspector();
+      StackInspector(const bool aReport);
       ~StackInspector();
 
-      void init();
-      void run();
-      double GetStepLength();
+      void Init();
+
+      // template <typename Particle, typename Trajectory, typename Stack>
+      EProcessReturn DoContinuous(Particle&, Trajectory&, Stack& s) const;
+
+      // template <typename Particle>
+      double MinStepLength(Particle&) const;
+
+      // template <typename Particle, typename Stack>
+      void DoDiscrete(Particle&, Stack&) const;
+
+    private:
+      bool fReport;
     };
 
   } // namespace stack_inspector

SCIENTIFIC_AUTHORS

+(empty...tbd)
+

Setup/CMakeLists.txt

+
+set (
+  SETUP_HEADERS
+  SetupStack.h
+  SetupLogger.h
+  SetupEnvironment.h
+  SetupTrajectory.h
+  )
+
+set (
+  SETUP_NAMESPACE
+  corsika/setup
+  )
+
+add_library (CORSIKAsetup INTERFACE)
+CORSIKA_COPY_HEADERS_TO_NAMESPACE (CORSIKAsetup ${SETUP_NAMESPACE} ${SETUP_HEADERS})
+
+target_link_libraries (
+  CORSIKAsetup
+  INTERFACE
+  CORSIKAgeometry
+  SuperStupidStack
+  )
+
+target_include_directories (
+  CORSIKAsetup
+  INTERFACE 
+  $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+  $<INSTALL_INTERFACE:include/include>
+  )
+
+install (
+  FILES ${SETUP_HEADERS} 
+  DESTINATION include/${SETUP_NAMESPACE}
+  )

Setup/SetupEnvironment.h

+#ifndef _include_corsika_setup_environment_h_
+#define _include_corsika_setup_environment_h_
+
+namespace corsika {}
+
+#endif

Setup/SetupLogger.h

+#ifndef _include_corsika_setup_logger_h_
+#define _include_corsika_setup_logger_h_
+
+namespace corsika {}
+
+#endif

Setup/SetupStack.h

+#ifndef _corsika_setup_setupstack_h_
+#define _corsika_setup_setupstack_h_
+
+#include <corsika/stack/super_stupid/SuperStupidStack.h>
+
+namespace corsika::setup {
+
+  typedef corsika::stack::super_stupid::SuperStupidStack Stack;
+}
+
+#endif

Setup/SetupTrajectory.h

+#ifndef _corsika_setup_setuptrajectory_h_
+#define _corsika_setup_setuptrajectory_h_
+
+#include <corsika/geometry/LineTrajectory.h>
+
+namespace corsika::setup {
+
+  typedef corsika::geometry::LineTrajectory Trajectory;
+}
+
+#endif

Stack/DummyStack/DummyStack.h

+
+/**
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #ifndef _include_dummystack_h_
 #define _include_dummystack_h_
 

Stack/DummyStack/SuperStupidStack.h

+
+/**
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #ifndef _include_superstupidstack_h_
 #define _include_superstupidstack_h_
 

Stack/SuperStupidStack/SuperStupidStack.h

+
+/**
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
 #ifndef _include_superstupidstack_h_
 #define _include_superstupidstack_h_
 

do-copyright.py

+#!/usr/bin/python
+
+import os.path
+
+text = """
+/**
+  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+  * 
+  * See file AUTHORS for a list of contributors.
+  * 
+  * This software is distributed under the terms of the GNU General Public
+  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+  * the license.
+*/\n
+"""
+
+excludeDirs = ["ThirdParty", "git"]
+excludeFiles = ['PhysicalConstants.h']
+
+extensions = [".cc", ".h", ".test"]
+
+def checkNote(filename):
+
+    startNote = -1
+    endNote = -1
+    isCopyright = False
+    lines = []
+
+    with open(filename, "r") as file:
+        for line in file.readlines():
+            lines.append(line)            
+        file.close()
+
+            
+    for iLine in range(len(lines)):
+        line = lines[iLine]
+        if "/**" in line and startNote == -1:
+            startNote = iLine
+        if "copyright" in line.lower() and startNote>=0 and endNote==-1:
+            isCopyright = True
+        if "*/" in line and startNote>=0 and endNote==-1:
+            endNote = iLine
+        iLine += 1
+
+    #if startNote>=0 and endNote>=0 and isCopyright:
+    #print filename
+    #for iLine in range(startNote, endNote+1):
+    #   print lines[iLine]
+
+    os.rename(filename, filename+".bak")
+    
+    with open(filename, "w") as file:
+
+        file.write(text)
+
+        firstLine = 0
+        if startNote>=0 and endNote>=0 and isCopyright:
+            firstLine = endNote + 2
+
+        for iLine in range(firstLine, len(lines)):
+            file.write(lines[iLine])
+        
+        file.close()
+
+
+def next_file(x, dir_name, files):
+    for check in excludeDirs :
+        if check in dir_name:
+            return
+    for check in files :
+        filename, file_extension = os.path.splitext(check)
+        for check2 in excludeFiles :
+            if check2 in check:
+                return
+        if file_extension in extensions:
+            checkNote(dir_name + "/" + check)
+
+
+os.path.walk("./", next_file, 0)