Changeset 73 in JEM-EUSO for esaf_lal

Timestamp:

Apr 15, 2013, 6:57:42 PM (11 years ago)

Author:

barrand

Message:

G.Barrand : Darwin : arrange to create the global TF2 objets when needed. It avoids a crash at startup of Simu

File:

• esaf_lal/trunk/esaf/packages/simulation/generators/showers/src/ShowerTrack.cc (modified) (5 diffs)

esaf_lal/trunk/esaf/packages/simulation/generators/showers/src/ShowerTrack.cc

@@ -171 +171 @@
 }
 
+#ifdef __APPLE__
+//G.Barrand : on Mac the below global variables induces a crash at startup of
+//            Simu. Then we create the objects "when needed" in the
+//            ShowerTrack::Get methods. Sight, using global variables,
+//            as long as the singleton pattern, is NEVER a good idea.        
+TF2* ShowerTrack::fEnergyAgeDistributionDefault = 0;
+TF2* ShowerTrack::fEnergyAgeDistributionHillas  = 0;
+TF2* ShowerTrack::fEnergyAgeDistributionGiller  = 0;
+TF2* ShowerTrack::fEnergyAgeDistributionNerling = 0;
+TF2* ShowerTrack::fEnergyAgeDistributionMelot   = 0;
+TF2* ShowerTrack::fLateralDistributionDefalt = 0;
+TF2* ShowerTrack::fLateralDistribution1 = 0;
+TF2* ShowerTrack::fLateralDistribution2 = 0;
+TF2* ShowerTrack::fLateralDistribution3 = 0;
+TF2* ShowerTrack::fAngularDistribution1 = 0;
+#else
 // Set of static distributions. Note! Default does not mean that this is the best rather it is
 // a convinient choice for the debugging study
@@ -185 +201 @@
 
 TF2* ShowerTrack::fAngularDistribution1 = new TF2("baltru",ShowerTrackBaltru,0.,Pi(),.5,1000.);
+#endif
 
 //______________________________________________________________________________
@@ -207 +224 @@
     // Return Pointer to the energy distribution of electrons in the shower
     // 
+
+#ifdef __APPLE__
+  //G.Barrand :
+  if(!fEnergyAgeDistributionDefault)
+    fEnergyAgeDistributionDefault = new TF2("EneAgeDefault",ShowerTrackGiller,0.1,1000,m,2);
+  if(!fEnergyAgeDistributionHillas)
+    fEnergyAgeDistributionHillas  = new TF2("hillas",ShowerTrackHillas,0.1,1000,0,2);
+  if(!fEnergyAgeDistributionGiller)
+    fEnergyAgeDistributionGiller  = new TF2("giller",ShowerTrackGiller,0.1,1000,0,2);
+  if(!fEnergyAgeDistributionNerling)
+    fEnergyAgeDistributionNerling = new TF2("nerling",ShowerTrackNerling,0.1,1000,0,2);
+  if(!fEnergyAgeDistributionMelot)
+    fEnergyAgeDistributionMelot   = new TF2("melot",ShowerTrackMelot,0.1,1000,0,2);
+#endif
+
     if( name == "hillas" )
         return fEnergyAgeDistributionHillas;
@@ -223 +255 @@
     // Return Pointer to the lateral distribution of electrons in the shower
     // 
+#ifdef __APPLE__
+  //G.Barrand :
+  if(!fLateralDistributionDefalt)
+    fLateralDistributionDefalt = new TF2("LateralDistributionDefalt",ShowerTrackNKG1,0.001,50,0,2);
+  if(!fLateralDistribution1)
+    fLateralDistribution1 = new TF2("NKG1",ShowerTrackNKG1,0.001,50,0,2);
+  if(!fLateralDistribution2)
+    fLateralDistribution2 = new TF2("NKG",ShowerTrackNKG2,0.001,5000,0,2,1);
+  if(!fLateralDistribution3)
+    fLateralDistribution3 = new TF2("NKGhadron",ShowerTrackNKGhadron,0.001,5000,0,2,1);
+#endif
+
     if( name == "NKG1" )
         return fLateralDistribution1;
@@ -239 +283 @@
     // Return Pointer to the angular distribution of electrons in the shower
     // 
+#ifdef __APPLE__
+  //G.Barrand :
+  if(!fAngularDistribution1)
+    fAngularDistribution1 = new TF2("baltru",ShowerTrackBaltru,0.,Pi(),.5,1000.);
+#endif
+
     if( name == "baltru" )
         return fAngularDistribution1;