--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java	Thu Aug 16 15:47:10 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java	Thu Aug 16 16:27:53 2018 +0200
@@ -9,7 +9,6 @@
 package org.dive4elements.river.artifacts.model.fixings;
 
 import org.apache.log4j.Logger;
-
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.D4EArtifact;
@@ -17,101 +16,86 @@
 import org.dive4elements.river.artifacts.model.DataFacet;
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
-import org.dive4elements.river.utils.KMIndex;
 
 /**
  * Facet to show average W values for Q sectors.
  *
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
  */
-public class FixLongitudinalAnalysisFacet
-extends      DataFacet
-implements   FacetTypes {
+public class FixLongitudinalAnalysisFacet extends DataFacet implements FacetTypes {
+
+    private static final long serialVersionUID = 1L;
 
     /** House log. */
-    private static Logger log = Logger.getLogger(
-        FixLongitudinalAnalysisFacet.class);
+    private static Logger log = Logger.getLogger(FixLongitudinalAnalysisFacet.class);
+
+    private int periodIndex;
+
+    private int columnId;
 
     /** Trivial Constructor. */
     public FixLongitudinalAnalysisFacet() {
     }
 
+    public FixLongitudinalAnalysisFacet(final int facetIndex, final int periodIndex, final int columnId, final String name, final String description) {
+        super(facetIndex, name, description, ComputeType.ADVANCE, null, null);
 
-    public FixLongitudinalAnalysisFacet(
-        int ndx,
-        String name,
-        String description)
-    {
-        super(
-            ndx,
-            name,
-            description,
-            ComputeType.ADVANCE,
-            null,
-            null);
+        this.periodIndex = periodIndex;
+        this.columnId = columnId;
     }
 
-
     /**
      * Returns the data this facet requires.
      *
-     * @param artifact the owner artifact.
-     * @param context  the CallContext.
+     * @param artifact
+     *            the owner artifact.
+     * @param context
+     *            the CallContext.
      *
      * @return the data as KMIndex.
      */
     @Override
-    public Object getData(Artifact artifact, CallContext context) {
+    public Object getData(final Artifact artifact, final CallContext context) {
         log.debug("FixLongitudinalAnalysisFacet.getData");
 
         if (artifact instanceof D4EArtifact) {
-            D4EArtifact flys = (D4EArtifact)artifact;
+            final D4EArtifact flys = (D4EArtifact) artifact;
 
-            CalculationResult res =
-                (CalculationResult) flys.compute(context,
-                                                 ComputeType.ADVANCE,
-                                                 false);
+            final CalculationResult res = (CalculationResult) flys.compute(context, ComputeType.ADVANCE, false);
 
-            FixAnalysisResult result = (FixAnalysisResult) res.getData();
+            final FixAnalysisResult result = (FixAnalysisResult) res.getData();
 
-            KMIndex<AnalysisPeriod []> kmPeriods = result.getAnalysisPeriods();
-            if (kmPeriods == null) {
-                log.warn("No analysis periods found.");
+            final AnalysisPeriodEventResults eventResults = result.getAnalysisEventResults();
+            final FixResultColumns eventResult = eventResults.getEventResults(this.periodIndex);
+            if (eventResult == null) {
+                log.error("No event result for period: " + this.periodIndex);
                 return null;
             }
-            int periodNdx = index >> 8;
-            int qwdNdx = index & 255;
-            KMIndex<QWD> resPeriods =
-                    new KMIndex<QWD>();
-            for (KMIndex.Entry<AnalysisPeriod[]> entry: kmPeriods) {
-                AnalysisPeriod ap = entry.getValue()[periodNdx];
-                QWD[] qwds = ap.qwds;
-                for(int i = 0; i < qwds.length; i++) {
-                    if(qwds[i].getIndex() == qwdNdx) {
-                        resPeriods.add(entry.getKm(), qwds[i]);
-                    }
-                }
+
+            final FixResultColumn event = eventResult.getColumn(this.columnId);
+            if (event == null) {
+                log.error("Missing event with columnId: " + this.columnId);
+                return null;
             }
 
-
-            return resPeriods;
+            return event.getQWDs();
         }
-        else {
-            log.warn("Artifact is no instance of D4EArtifact.");
-            return null;
-        }
+
+        log.warn("Artifact is no instance of D4EArtifact.");
+        return null;
     }
 
-
     /**
      * Create a deep copy of this Facet.
+     *
      * @return a deep copy.
      */
     @Override
     public FixLongitudinalAnalysisFacet deepCopy() {
-        FixLongitudinalAnalysisFacet copy = new FixLongitudinalAnalysisFacet();
+        final FixLongitudinalAnalysisFacet copy = new FixLongitudinalAnalysisFacet();
         copy.set(this);
+        copy.periodIndex = this.periodIndex;
+        copy.columnId = this.columnId;
         return copy;
     }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
+}
\ No newline at end of file