From 0e020327b1e3a948da8b05244a0755785d1ce548 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Thu, 31 Jan 2019 17:10:08 +0100
Subject: [PATCH] started stack view
---
Documentation/Examples/stack_example.cc | 3 ++-
Framework/StackInterface/Stack.h | 2 ++
Framework/StackInterface/StackIteratorInterface.h | 1 +
Framework/StackInterface/StackView.h | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/Examples/stack_example.cc b/Documentation/Examples/stack_example.cc
index 3d28e5566..3431db459 100644
--- a/Documentation/Examples/stack_example.cc
+++ b/Documentation/Examples/stack_example.cc
@@ -19,9 +19,10 @@
#include <iomanip>
#include <iostream>
+using namespace corsika;
using namespace corsika::units::si;
using namespace corsika::stack;
-using namespace corsika;
+using namespace corsika::geometry;
using namespace std;
void fill(corsika::stack::super_stupid::SuperStupidStack& s) {
diff --git a/Framework/StackInterface/Stack.h b/Framework/StackInterface/Stack.h
index ff92fa238..0492852f0 100644
--- a/Framework/StackInterface/Stack.h
+++ b/Framework/StackInterface/Stack.h
@@ -142,6 +142,8 @@ namespace corsika::stack {
StackIterator GetNextParticle() { return last(); }
protected:
+ unsigned int GetIndexFromIterator(const unsigned int vI) const { return vI; }
+
StackData& GetStackData() { return static_cast<StackData&>(*this); }
const StackData& GetStackData() const { return static_cast<const StackData&>(*this); }
};
diff --git a/Framework/StackInterface/StackIteratorInterface.h b/Framework/StackInterface/StackIteratorInterface.h
index 74f1a7802..783a6924d 100644
--- a/Framework/StackInterface/StackIteratorInterface.h
+++ b/Framework/StackInterface/StackIteratorInterface.h
@@ -237,6 +237,7 @@ namespace corsika::stack {
*/
///@{
inline unsigned int GetIndex() const { return fIndex; }
+ // inline unsigned int GetIndex() const { return fData->GetIndexFromIterator(fIndex); }
inline const StackType& GetStack() const { return *fData; }
inline const StackData& GetStackData() const { return fData->GetStackData(); }
///@}
diff --git a/Framework/StackInterface/StackView.h b/Framework/StackInterface/StackView.h
index f4d72e22b..f7eb8b5da 100644
--- a/Framework/StackInterface/StackView.h
+++ b/Framework/StackInterface/StackView.h
@@ -1,6 +1,7 @@
#ifndef _include_corsika_stack_stackview_h_
#define _include_corsika_stack_stackview_h_
+#include <vector>
namespace corsika::stack {
--
GitLab