Correct a critical bug for grammage mode and add some more example ca…

…rds.
niess · Aug 19, 2017 · 6430da7 · 6430da7
1 parent ef4c2e7
commit 6430da7
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 4 deletions.
diff --git a/cards/forward-tau-decays.json b/cards/forward-tau-decays.json
@@ -0,0 +1,25 @@
+{
+        "events" : 10000,
+        "output-file" : null,
+
+        "mode" : "forward",
+        "longitudinal" : false,
+        "decay" : true,
+
+        "earth-model" : { "sea" : true },
+
+        "particle-sampler" : {
+                "altitude" : [ 0, 1E+4 ],
+                "elevation" : 1.0,
+                "energy" : [ 1E+06, 1E+12 ],
+                "weight" : { "tau" : 1.0 }
+        },
+
+        "primary-flux" : {
+                "nu_tau" : [ "power-law", {
+                        "energy" : [ 1E+06, 1E+12 ],
+                        "exponent" : -2.0,
+                        "weight" : 1.0
+                        } ]
+        }
+}
diff --git a/cards/grammage.json b/cards/grammage.json
@@ -0,0 +1,14 @@
+{
+        "events" : 10,
+        "output-file" : null,
+
+        "mode" : "grammage",
+        "longitudinal" : true,
+
+        "earth-model" : { "sea" : true },
+
+        "particle-sampler" : {
+                "altitude" : 0,
+                "elevation" : [0.1, 90.0]
+        }
+}
diff --git a/src/danton.c b/src/danton.c
@@ -1824,10 +1824,12 @@ int danton_run(struct danton_context * context, long events)
                         const double z0 = sample_log_or_linear(
                             context_, sampler->altitude, &weight);
 
-                        context_->record->api.id = i;
-                        context_->record->api.generation = 1;
-                        context_->record->api.vertex = NULL;
-                        context_->record->api.n_products = 0;
+                        if (context->mode != DANTON_MODE_GRAMMAGE) {
+                                context_->record->api.id = i;
+                                context_->record->api.generation = 1;
+                                context_->record->api.vertex = NULL;
+                                context_->record->api.n_products = 0;
+                        }
                         if ((context->mode != DANTON_MODE_GRAMMAGE) &&
                             !context_->flux_neutrino) {
                                 /* This is a particle Monte-Carlo. */