Changeset 19971

Timestamp:

07/20/20 16:20:59 (4 years ago)

Author:

tbretz

Message:

Added a binning in Impact Parameter for crosschecks

Location:

trunk/FACT++

Files:

• spectrum/display.C (modified) (1 diff)
• spectrum/simulation.sql (modified) (3 diffs)
• src/spectrum.cc (modified) (11 diffs)

trunk/FACT++/spectrum/display.C

@@ -91 +91 @@
     h1->SetMarkerStyle(23);
     h1->DrawCopy("P same");
+
+    // --------------------------------
+
+    c = new TCanvas("Impact", "Impact");
+    c->Divide(2,2);
+    c->cd(1);
+    file.GetObject("MC/dense/TrueEnergy/Impact", h2);
+    h2->DrawCopy("colz");
+    h2->DrawCopy("same");
+    c->cd(2);
+    file.GetObject("MC/sparse/TrueEnergy/Impact", h2);
+    h2->DrawCopy("colz");
+    h2->DrawCopy("same");
+    c->cd(3);
+    file.GetObject("MC/theta/Impact", h2);
+    h2->DrawCopy("colz");
+    h2->DrawCopy("same");
 
     // --------------------------------

trunk/FACT++/spectrum/simulation.sql

@@ -10 +10 @@
       INTERVAL(LOG10(Energy), %108:sparse)  AS `.sparse_sim`,
       INTERVAL(LOG10(Energy), %109:dense)  AS `.dense_sim`,
+      INTERVAL(Impact/100, %110:impact)  AS `.impact`,
 
-      (%110:spectrum)/POW(Energy, SpectralIndex) AS SpectralWeight,  -- FIXME: Is this correct for files with different Slopes?
+      (%111:spectrum)/POW(Energy, SpectralIndex) AS SpectralWeight,  -- FIXME: Is this correct for files with different Slopes?
       LogEnergyEst - log10(Energy) AS Residual
    FROM
@@ -27 +28 @@
    `.dense_est`,
    `.dense_sim`,
+   `.impact`,
 
    -- Without any weight applied
@@ -59 +61 @@
    ThetaDist USING(`.theta`)
 GROUP BY
-   `.theta`, `.sparse_est`, `.sparse_sim`, `.dense_est`, `.dense_sim`
+   `.theta`, `.sparse_est`, `.sparse_sim`, `.dense_est`, `.dense_sim`, `.impact`

trunk/FACT++/src/spectrum.cc

@@ -139 +139 @@
     po::options_description binnings("Binnings");
     binnings.add_options()
-        ("theta",             var<Binning>(Binning(90, 0, 90)), "Add equidistant bins in theta (degrees). Syntax: N,lo,hi (Number N of equidistant bins between lo and hi)")
-        ("theta-bin",         vars<double>(),                   "Add a bin-edge to the theta binning (degree)")
-        ("energy-dense",      var<Binning>(Binning(30, 2, 5)),  "Add equidistant bins in log10 simulated energy. Syntax: N,lo,hi (Number N of equidistant bins between lo and hi)")
-        ("energy-dense-bin",  vars<double>(),                   "Add a bin-edge to the binnnig in log10 simulated enegry")
-        ("energy-sparse",     var<Binning>(Binning(15, 2, 5)),  "Add equidistant bins in log10 estimated energy. Syntax: N,lo,hi (Number N of equidistant bins between lo and hi)")
-        ("energy-sparse-bin", vars<double>(),                   "Add a bin-edge to the binning in log10 estimated enegry")
+        ("theta",             var<Binning>(Binning(90, 0, 90)),  "Add equidistant bins in theta (degrees). Syntax: N,lo,hi (Number N of equidistant bins between lo and hi)")
+        ("theta-bin",         vars<double>(),                    "Add a bin-edge to the theta binning (degree)")
+        ("energy-dense",      var<Binning>(Binning(30, 2, 5)),   "Add equidistant bins in log10 simulated energy. Syntax: N,lo,hi (Number N of equidistant bins between lo and hi)")
+        ("energy-dense-bin",  vars<double>(),                    "Add a bin-edge to the binnnig in log10 simulated enegry")
+        ("energy-sparse",     var<Binning>(Binning(15, 2, 5)),   "Add equidistant bins in log10 estimated energy. Syntax: N,lo,hi (Number N of equidistant bins between lo and hi)")
+        ("energy-sparse-bin", vars<double>(),                    "Add a bin-edge to the binning in log10 estimated enegry")
+        ("impact",            var<Binning>(Binning(28, 0, 280)), "Add equidistant bins in impact in meter. Syntax: N,lo,hi (Number N of equidistant bins between lo and hi)")
+        ("impact-bin",        vars<double>(),                    "Add a bin-edge to the binning in impact in meter")
         ;
 
@@ -632 +634 @@
     Binning binning_dense  = conf.Get<Binning>("energy-dense");
     Binning binning_sparse = conf.Get<Binning>("energy-sparse");
+    Binning binning_impact = conf.Get<Binning>("impact");
 
     cout << '\n';
-    cout << "Binning 'theta':  " << binning_theta.str() << endl;
+    cout << "Binning 'theta':  " << binning_theta.str()  << endl;
     cout << "Binning 'dense':  " << binning_dense.str()  << endl;
-    cout << "Binning 'sparse': " << binning_sparse.str()  << endl;
+    cout << "Binning 'sparse': " << binning_sparse.str() << endl;
+    cout << "Binning 'impact': " << binning_impact.str() << endl;
 
     const uint16_t source_key = conf.Get<uint16_t>("source-key");
@@ -656 +660 @@
     const string str_dense  = binning_dense.list();
     const string str_sparse = binning_sparse.list();
+    const string str_impact = binning_impact.list();
 
     // -------------------------------------------------------------------------
@@ -745 +750 @@
     CreateBinning(connection, qlog, binning_dense,  "Energy_dense",  "Dense binning in log10 Energy");
     CreateBinning(connection, qlog, binning_sparse, "Energy_sparse", "Sparse binning in log10 Energy");
+    CreateBinning(connection, qlog, binning_impact, "Impact",        "Binning in impact distance");
 
     Dump(flog, connection, "BinningTheta");
     Dump(flog, connection, "BinningEnergy_dense");
     Dump(flog, connection, "BinningEnergy_sparse");
+    Dump(flog, connection, "BinningImpact");
 
     // -------------------------------------------------------------------
@@ -928 +935 @@
         "   LEFT JOIN\n"
         "      factmc.CorsikaSetup ON FileId=RUNNR\n"
-        "   GROUP BY\n"
-        "      `CSCAT[1]`, `CSCAT[2]`\n"
+        // "   GROUP BY\n"
+        // "      `CSCAT[1]`, `CSCAT[2]`\n"
         "   ORDER BY\n"
         "      MaxImpactHi\n"
@@ -955 +962 @@
         cout << "Execution time: " << sec4 << "s\n\n";
     }
-
 
     // -------------------------------------------------------------------
@@ -1297 +1303 @@
         "   INDEX (`.dense_sim`)                 USING HASH,\n"
         "   INDEX (`.sparse_est`, `.sparse_sim`) USING HASH,\n"
-        "   INDEX (`.dense_est`, `.dense_sim`)   USING HASH\n"
+        "   INDEX (`.dense_est`, `.dense_sim`)   USING HASH,\n"
+        "   INDEX (`.impact`)                    USING HASH\n"
         ") ENGINE=MEMORY COMMENT='Sum of counts and (squared) weightes of Monte Carlo Data after analysis'\n"
         "AS\n"
@@ -1317 +1324 @@
 
     //query6.template_defaults["columns"]   = "FileId, EvtNumber, CorsikaNumReuse,";
-    query8.template_defaults["columns"]   = "Energy, SpectralIndex,";
+    query8.template_defaults["columns"]   = "Energy, SpectralIndex, Impact,";
     query8.template_defaults["zenith"]    = "DEGREES(Theta)";
     query8.template_defaults["files"]     = "MonteCarloFiles";
@@ -1327 +1334 @@
     query8.template_defaults["dense"]     = str_dense.c_str();
     query8.template_defaults["theta"]     = str_theta.c_str();
+    query8.template_defaults["impact"]    = str_impact.c_str();
     query8.template_defaults["spectrum"]  = spectrum.c_str();
     query8.template_defaults["estimator"] = estimator.c_str();
@@ -1619 +1627 @@
         WriteHistogram(connection, hist_sim);
 
+        // -------------------------------------------------------------------
+        // ------------------------ ImpactDistribution -----------------------
+        // -------------------------------------------------------------------
+
+        cout << separator("ImpactDistribution_"+*ib) << '\n';
+
+        Time start13;
+
+        mysqlpp::Query query13(&connection);
+        query13 <<
+            "CREATE TEMPORARY TABLE ImpactDistribution_%100:binning\n"
+            "(\n"
+            "   SignalN INT UNSIGNED NOT NULL\n"
+            ") ENGINE=MEMORY COMMENT='Impact Distribution of unweighted signal events after cuts'\n"
+            "AS\n"
+            "(\n"
+            "   SELECT\n"
+            "      %101:bin,\n"
+            "      `.impact`,\n"
+            "      SUM(SignalN) AS SignalN\n"
+            "   FROM\n"
+            "      AnalysisMC\n"
+            "   GROUP BY\n"
+            "      %101:bin, `.impact`\n"
+            "   ORDER BY\n"
+            "      %101:bin, `.impact`\n"
+            ")";
+
+        query13.parse();
+
+        query13.template_defaults["binning"] = ib->c_str();
+        query13.template_defaults["bin"]     = *ib=="theta" ? "`.theta`" : ("`."+*ib+"_sim`").c_str();
+
+        if (print_queries)
+            PrintQuery(query13.str());
+
+        qlog << query13 << ";\n" << endl;
+        if (connection.connected())
+        {
+            cout << query13.execute().info() << endl;
+            ShowWarnings(connection);
+            Dump(flog, connection, "ImpactDistribution_"+*ib);
+
+            const auto sec13 = Time().UnixTime()-start13.UnixTime();
+            cout << "Execution time: " << sec13 << "s\n";
+        }
+
+        hist_sim.name     = "Impact";
+        hist_sim.title    = "Distribution of Impact Distance";
+        hist_sim.y        = ".impact";
+        hist_sim.v        = "SignalN";
+        hist_sim.err      = "";
+        hist_sim.table    = "ImpactDistribution_"+*ib;
+        hist_sim.binningy = binning_impact;
+        hist_sim.axisy    = "Impact Distance [m]";
+        hist_sim.axisz    = "Counts";
+
+        WriteHistogram(connection, hist_sim);
+
+        // ===================================================================
+        // ===================================================================
+
         if (*ib=="theta")
             continue;
+
+        // ===================================================================
+        // ===================================================================
+
 
         // -------------------------------------------------------------------
@@ -1796 +1870 @@
 
         // -------------------------------------------------------------------
-        // ------------------------- SimulatedSpectrum -----------------------
+        // -------------------------- MigrationMatrix ------------------------
         // -------------------------------------------------------------------