Changeset 1430 for trunk/WuerzburgSoft/Thomas

Timestamp:

07/24/02 10:11:36 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/WuerzburgSoft/Thomas/mphys

Files:

• MElectron.cc (modified) (6 diffs)
• MElectron.h (modified) (1 diff)
• MParticle.cc (modified) (2 diffs)
• MPhoton.cc (modified) (3 diffs)
• phys.C (modified) (5 diffs)

trunk/WuerzburgSoft/Thomas/mphys/MElectron.cc

@@ -30 +30 @@
 #include "MElectron.h"
 
+#include <math.h>     // for aqlphas
 #include <iostream.h>
 
@@ -52 +53 @@
 }
 
-Double_t DiSum(Double_t *x, Double_t *k=NULL)
+Double_t MElectron::DiSum(Double_t *x, Double_t *k)
 {
     Double_t t = x[0];
@@ -78 +79 @@
 }
 
-Double_t MElectron::Li2(Double_t *x, Double_t *k=NULL)
+Double_t MElectron::Li2(Double_t *x, Double_t *k)
 {
     //
@@ -100 +101 @@
 }
 
-Double_t MElectron::Flim(Double_t *x, Double_t *k=NULL) // F(omegap)-F(omegam)  mit  b-->1   (Maple)
+Double_t MElectron::Flim(Double_t *x, Double_t *k) // F(omegap)-F(omegam)  mit  b-->1   (Maple)
 {
     const Double_t w = x[0];
@@ -134 +135 @@
 }
 
-Double_t MElectron::InteractionLength(Double_t *E, Double_t *k=NULL)
+Double_t MElectron::InteractionLength(Double_t *E, Double_t *k)
 {
     // E    = electron energy,          ~  TeV(?)  1e12
@@ -205 +206 @@
 // --------------------------------------------------------------------------
 
-inline Double_t MElectron::p_e(Double_t *x, Double_t *k)
+/*inline*/ Double_t MElectron::p_e(Double_t *x, Double_t *k)
 {
     Double_t e = pow(10, x[0]);

trunk/WuerzburgSoft/Thomas/mphys/MElectron.h

@@ -21 +21 @@
     // ----------------------------------------------------------------
 
+    static Double_t DiSum(Double_t *x, Double_t *k=NULL);
     static Double_t Li(Double_t *x, Double_t *k);
     static Double_t Li2(Double_t *x, Double_t *k=NULL);

trunk/WuerzburgSoft/Thomas/mphys/MParticle.cc

@@ -79 +79 @@
 TH2D *hist2;
 
-Double_t MParticle::Planck(Double_t *x, Double_t *k=NULL)
+Double_t MParticle::Planck(Double_t *x, Double_t *k)
 {
     static Bool_t isloaded = kFALSE;
@@ -91 +91 @@
         Double_t konst = 4.*TMath::Pi() * 2. / (hc*hc*hc);
 
-        ifstream fin("background.txt");
+        ifstream fin("mphys/background.txt");
 
         hist2 = new TH2D;

trunk/WuerzburgSoft/Thomas/mphys/MPhoton.cc

@@ -39 +39 @@
 ClassImp(MPhoton);
 
-Double_t MPhoton::Sigma_gg(Double_t *x, Double_t *k=NULL)
+Double_t MPhoton::Sigma_gg(Double_t *x, Double_t *k)
 {
     const Double_t m2 = x[0]; // m2: (E0/sqrt(s))^2
@@ -63 +63 @@
 }
 
-Double_t MPhoton::Int1(Double_t *x, Double_t *k=NULL)
+Double_t MPhoton::Int1(Double_t *x, Double_t *k)
 {
     const Double_t costheta = x[0];
@@ -108 +108 @@
 // Returns 0 in case IL becomes (numerically) infinite.
 //
-Double_t MPhoton::InteractionLength(Double_t *x, Double_t *k=NULL)
+Double_t MPhoton::InteractionLength(Double_t *x, Double_t *k)
 {
     Double_t E0 = 511e-6;                  // [GeV]

trunk/WuerzburgSoft/Thomas/mphys/phys.C

@@ -137 +137 @@
     Double_t R      = MParticle::RofZ(&startz); // [kpc]
 
-    const char *filename = "delme3H.root";
+    const char *filename = "cascade_0.03_24_1e2_1e6_256_1.root";
 
     const Double_t B = 0; // [T] mean magnetic field
 
-    Double_t runtime = 8*60*60; // [s] maximum time to run the simulation
+    Double_t runtime = 3.5*60*60; // [s] maximum time to run the simulation
 
     Int_t nbins = 24;     // number of bins produced in energy spectrum
@@ -157 +157 @@
     cout << "R = " << R << "kpc" << endl;
     cout << "Z = " << startz << endl;
+
+    cout << "Setting up: Histograms... " << flush;
 
     MPairProduction pair;
@@ -209 +211 @@
     // ------------------------------
 
-    void *ptr = NULL;
+    cout << "Output File... " << flush;
+
     TFile file(filename, "RECREATE", "Intergalactic cascade", 9);
+    cout << "Trees... " << flush;
     TTree   *T1 = new TTree ("Photons",    "Photons from Cascade");
     TTree   *T2 = new TTree ("Electrons",  "Electrons in the Cascade");
+    cout << "Branches... " << flush;
+    MPhoton dummyp;
+    void *ptr = &dummyp;
     TBranch *B1 = T1->Branch("MPhoton.",   "MPhoton",   &ptr);
+    MPhoton dummye;
+    ptr = &dummye;
     TBranch *B2 = T2->Branch("MElectron.", "MElectron", &ptr);
 
     // ------------------------------
+
+    cout << "Timers... " << flush;
 
     TTimer timer("gSystem->ProcessEvents();", 250, kFALSE);
@@ -223 +234 @@
     TStopwatch clock;
     clock.Start();
+
+    cout << "Done. " << endl;
 
     Int_t n=0;
@@ -339 +352 @@
 
                 cout << ":" << flush;
-                int test = counter<0 ? -1 : counter;
-                while (test<0 ? true : (test++<256))
+                int test = counter<0 ? -1 : 0;
+                while (test<0 ? true : (test++<counter))
                 {