Changeset bff2e33 in git for modules

Timestamp:

May 4, 2016, 1:52:33 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

76c2a3b

Parents:

f01803a

Message:

added exception for beamspot array

Location:

modules

Files:

• ParticlePropagator.cc (modified) (2 diffs)
• TrackSmearing.cc (modified) (2 diffs)

modules/ParticlePropagator.cc

@@ -93 +93 @@
 
   // import beamspot
- 
-  fBeamSpotInputArray = ImportArray(GetString("BeamSpotInputArray", "BeamSpotFilter/beamSpotParticle"));
-
+  try
+  {
+    fBeamSpotInputArray = ImportArray(GetString("BeamSpotInputArray", "BeamSpotFilter/beamSpotParticle"));
+  }
+  catch(runtime_error &e)
+  {
+    fBeamSpotInputArray = 0;
+  }  
   // create output arrays
 
@@ -131 +136 @@
   const Double_t c_light = 2.99792458E8;
  
-  if (!fBeamSpotInputArray->GetSize () || !fBeamSpotInputArray->At(0)) 
+  if (!fBeamSpotInputArray || fBeamSpotInputArray->GetSize () == 0) 
     beamSpotPosition.SetXYZT(0.0, 0.0, 0.0, 0.0);
   else

modules/TrackSmearing.cc

@@ -129 +129 @@
   fItInputArray = fInputArray->MakeIterator();
  
-  fBeamSpotInputArray = ImportArray(GetString("BeamSpotInputArray", "BeamSpotFilter/beamSpotParticle"));
-
+  // import beamspot
+  try
+  {
+    fBeamSpotInputArray = ImportArray(GetString("BeamSpotInputArray", "BeamSpotFilter/beamSpotParticle"));
+  }
+  catch(runtime_error &e)
+  {
+    fBeamSpotInputArray = 0;
+  }  
+ 
   // create output array
 
@@ -158 +166 @@
              *phiErrorHist = NULL;
 
- 
-  if (!fBeamSpotInputArray->GetSize () || !fBeamSpotInputArray->At(0)) 
+  //cout<<fBeamSpotInputArray->GetSize ()<<endl;
+  if (!fBeamSpotInputArray || fBeamSpotInputArray->GetSize () == 0) 
     beamSpotPosition.SetXYZT(0.0, 0.0, 0.0, 0.0);
   else