From 65ed7e5fe1244d8d918eb10c98a2e83abccf1a62 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Fri, 17 Jul 2020 13:57:42 +0200
Subject: [PATCH] remove comments and added pragmas
---
Environment/ShowerAxis.h | 1 +
Processes/CONEXSourceCut/CMakeLists.txt | 1 -
Processes/CONEXSourceCut/CONEXSourceCut.cc | 11 -----------
Processes/CONEXSourceCut/CONEXSourceCut.h | 7 +------
4 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/Environment/ShowerAxis.h b/Environment/ShowerAxis.h
index 413455a64..be5c605b6 100644
--- a/Environment/ShowerAxis.h
+++ b/Environment/ShowerAxis.h
@@ -9,6 +9,7 @@
*/
#pragma once
+
#include <corsika/environment/Environment.h>
#include <corsika/geometry/Point.h>
#include <corsika/geometry/Vector.h>
diff --git a/Processes/CONEXSourceCut/CMakeLists.txt b/Processes/CONEXSourceCut/CMakeLists.txt
index aa6861b14..1ef0f7c3f 100644
--- a/Processes/CONEXSourceCut/CMakeLists.txt
+++ b/Processes/CONEXSourceCut/CMakeLists.txt
@@ -47,7 +47,6 @@ install (
TARGETS ProcessCONEXSourceCut
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
-# PUBLIC_HEADER DESTINATION include/${MODEL_NAMESPACE}
)
# --------------------
diff --git a/Processes/CONEXSourceCut/CONEXSourceCut.cc b/Processes/CONEXSourceCut/CONEXSourceCut.cc
index 18c04a14b..5d0f68f8c 100644
--- a/Processes/CONEXSourceCut/CONEXSourceCut.cc
+++ b/Processes/CONEXSourceCut/CONEXSourceCut.cc
@@ -78,20 +78,13 @@ void CONEXSourceCut::addParticle(int egs_pid, HEPEnergyType energy,
double v = direction.dot(x_sf_).magnitude();
double w = direction.dot(showerAxis_.GetDirection()).magnitude();
- // int iri = 2; // EGS medium air
-
double weight = 1;
- // int latchin = 1; // generation, we don't have the actual value...
double E = energy / 1_GeV;
std::cout << "CONEXSourceCut: removing " << egs_pid << " " << std::scientific << energy
<< std::endl;
- // conex_.Shower(egs_pid, E, x, y, altitude, slantDistance, lateralX, lateralY,
- // slantX,
- // time, u, v, w, iri, weight, latchin);
-
std::cout << "#### parameters to show_() ####" << std::endl;
std::cout << "egs_pid = " << egs_pid << std::endl;
std::cout << "E = " << E << std::endl;
@@ -132,8 +125,6 @@ void CONEXSourceCut::SolveCE() {
conex::conexcascade_();
- // RU: this here is from cxroot:
-
int nX = conex::get_number_of_depth_bins_(); // make sure this works!
int icut = 1;
@@ -172,8 +163,6 @@ void CONEXSourceCut::SolveCE() {
}
}
-// RU: move all the non-C8 code from the following c++ function into a new file. Here we
-// only want to have a single function call to CONEX left.
CONEXSourceCut::CONEXSourceCut(geometry::Point center,
environment::ShowerAxis const& showerAxis,
diff --git a/Processes/CONEXSourceCut/CONEXSourceCut.h b/Processes/CONEXSourceCut/CONEXSourceCut.h
index a8e4d627a..c15f22fd4 100644
--- a/Processes/CONEXSourceCut/CONEXSourceCut.h
+++ b/Processes/CONEXSourceCut/CONEXSourceCut.h
@@ -8,11 +8,7 @@
* the license.
*/
-#ifndef _corsika_process_particle_cut_CONEXSourceCut_h_
-#define _corsika_process_particle_cut_CONEXSourceCut_h_
-
-//#define __CORSIKA8__ // must define this conex-internal flag
-//#include <ConexDynamicInterface.h>
+#pragma once
#include <corsika/environment/ShowerAxis.h>
#include <corsika/geometry/Point.h>
@@ -53,7 +49,6 @@ namespace corsika::process {
auto const& GetObserverCS() const { return conexObservationCS_; }
private:
- // ConexDynamicInterface conex_;
//! CONEX e.m. particle codes
static std::array<std::pair<particles::Code, int>, 3> constexpr egs_em_codes_{
--
GitLab