energy from disp

Author: GernotMaier

inc/CData.h

@@ -263,10 +263,12 @@ class CData
         TTree*          fFriendTree;              //!
         float         Dir_Xoff;                 //!
         float         Dir_Yoff;                 //!
+        float         Dir_Erec;                 //!
 
         CData( TTree* tree = 0, bool bMC = false, bool bShort = false, TTree* friendTree = 0 );
         virtual ~CData();
         virtual Int_t    GetEntry( Long64_t entry );
+        float get_Erec( unsigned int method = 0 );
         float get_Xoff( unsigned int method = 0 );
         float get_Yoff( unsigned int method = 0 );
         pair<float, float> get_XYoff_derot( unsigned int method = 0 );

src/CData.cpp

@@ -23,11 +23,13 @@ CData::CData( TTree* tree, bool bMC, bool bShort, TTree* friendTree )
     {
         fFriendTree->SetBranchAddress( "Dir_Xoff", &Dir_Xoff );
         fFriendTree->SetBranchAddress( "Dir_Yoff", &Dir_Yoff );
+        fFriendTree->SetBranchAddress( "Dir_Erec", &Dir_Erec );
     }
     else
     {
         Dir_Xoff = -9999.;
         Dir_Yoff = -9999.;
+        Dir_Erec = -9999.;
     }
 }
 
@@ -636,8 +638,39 @@ Bool_t CData::Notify()
     return kTRUE;
 }
 
+
 /*
- * Get stereo Xoff depending on analysis results
+* Get energy depending on analysis method
+* Methods:
+*
+* 0: (return friend tree result (if available) or Erec)
+* 1: return ErecS
+* 2: return Erec
+* 3: return friend tree result
+*/
+float CData::get_Erec( unsigned iMethod )
+{
+    if( iMethod == 0 && fFriendTree )
+    {
+        return Dir_Erec;
+    }
+    else if( iMethod == 1 )
+    {
+        return ErecS;
+    }
+    else if( iMethod == 2 )
+    {
+        return Erec;
+    }
+    else if( iMethod == 3 )
+    {
+        return Dir_Erec;
+    }
+    return Erec;
+}
+
+/*
+ * Get stereo Xoff depending on analysis method
  *
  * Methods:
  *
@@ -667,8 +700,9 @@ float CData::get_Xoff( unsigned iMethod )
     return ( float )Xoff;
 }
 
+
 /*
- * Get stereo Yoff depending on analysis results
+ * Get stereo Yoff depending on analysis method
  *
  * Methods:
  *

src/VDataMCComparision.cpp

@@ -2244,24 +2244,22 @@ bool VEffectiveAreaCalculator::fill( TH1D* hE0mc, CData* d,
 
         // skip event if no energy has been reconstructed
         // get energy according to which reconstruction method
-        if( iMethod == 0 && d->Erec > 0. )
-        {
-            eRec = log10( d->Erec );
-            eRecLin = d->Erec;
-        }
-        else if( iMethod == 1 && d->ErecS > 0. )
-        {
-            eRec = log10( d->ErecS );
-            eRecLin = d->ErecS;
-        }
-        else if( fIgnoreEnergyReconstruction )
+        if( fIgnoreEnergyReconstruction )
         {
             eRec = log10( d->MCe0 );
             eRecLin = d->MCe0;
         }
         else
         {
-            continue;
+            eRecLin = d->get_Erec(iMethod);
+            if( eRecLin > 0. )
+            {
+                eRec = log10(eRecLin);
+            }
+            else
+            {
+                continue;
+            }
         }
 
         ///////////////////////////////////////////

src/VEffectiveAreaCalculator.cpp

@@ -2534,15 +2534,7 @@ double VGammaHadronCuts::getReconstructedEnergy( unsigned int iEnergyReconstruct
     {
         return -99.;
     }
-    if( iEnergyReconstructionMethod == 0 )
-    {
-        return fData->Erec;
-    }
-    else if( iEnergyReconstructionMethod == 1 )
-    {
-        return fData->ErecS;
-    }
-    return -99.;
+    return fData->get_Erec(iEnergyReconstructionMethod);
 }
 
 double VGammaHadronCuts::getReconstructedEnergyChi2( unsigned int iEnergyReconstructionMethod )

src/VGammaHadronCuts.cpp

@@ -446,15 +446,7 @@ void VInstrumentResponseFunctionData::fill( double iWeight )
     }
 
     // get reconstructed energy
-    double iErec_lin = -99.e6;
-    if( fEnergyReconstructionMethod == 0 && fData->Erec > 0. )
-    {
-        iErec_lin = fData->Erec;
-    }
-    else if( fEnergyReconstructionMethod == 1 && fData->ErecS > 0. )
-    {
-        iErec_lin = fData->ErecS;
-    }
+    double iErec_lin = fData->get_Erec(fEnergyReconstructionMethod);
     if( iErec_lin < 0. )
     {
         return;

src/VInstrumentResponseFunctionData.cpp

@@ -2149,7 +2149,7 @@ void VStereoAnalysis::fill_TreeWithSelectedEvents( CData* c, double i_xderot, do
     fTreeSelected_MLR = c->MLR;
     fTreeSelected_Erec = c->Erec;
     fTreeSelected_EChi2 = c->EChi2;
-    fTreeSelected_ErecS = c->ErecS;
+    fTreeSelected_ErecS = c->get_Erec();
     fTreeSelected_EChi2S = c->EChi2S;
     fTreeSelected_EmissionHeight = c->EmissionHeight;
     fTreeSelected_EmissionHeightChi2 = c->EmissionHeightChi2;

src/VStereoAnalysis.cpp

@@ -731,11 +731,11 @@ bool VTMVAEvaluator::evaluate( bool interpolate_mva, bool use_average_zenith_ang
     {
         i_ze = fAverageZenithPerRun;
     }
-    if( fData->ErecS <= 0. )
+    if( fData->get_Erec() <= 0. )
     {
         return false;
     }
-    unsigned int iDataBin = getDataBin( log10( fData->ErecS ), i_ze );
+    unsigned int iDataBin = getDataBin( log10( fData->get_Erec() ), i_ze );
     if( fDebug )
     {
         cout << "VTMVAEvaluator::evaluate: data bin " << iDataBin;
@@ -775,14 +775,14 @@ bool VTMVAEvaluator::evaluate( bool interpolate_mva, bool use_average_zenith_ang
 */
 double VTMVAEvaluator::interpolate_mva_evaluation()
 {
-    if(!fData || fData->ErecS <= 0 )
+    if(!fData || fData->get_Erec() <= 0 )
     {
         return 9999.;
     }
     set<unsigned int> data_bins;
     for( unsigned int i = 0; i < fTMVAData.size(); i++ )
     {
-        data_bins.insert( getDataBin( log10( fData->ErecS ), 0.5 * ( fTMVAData[i]->fZenithCut_max + fTMVAData[i]->fZenithCut_min ) ) );
+        data_bins.insert( getDataBin( log10( fData->get_Erec() ), 0.5 * ( fTMVAData[i]->fZenithCut_max + fTMVAData[i]->fZenithCut_min ) ) );
     }
     TGraph iG(( int )data_bins.size() );
     unsigned int i = 0;
@@ -805,11 +805,11 @@ double VTMVAEvaluator::interpolate_mva_evaluation()
  */
 unsigned int VTMVAEvaluator::getDataBin()
 {
-    if(!fData || fData->ErecS <= 0 )
+    if(!fData || fData->get_Erec() <= 0 )
     {
         return 9999;
     }
-    return getDataBin( log10( fData->ErecS ), fData->Ze );
+    return getDataBin( log10( fData->get_Erec() ), fData->Ze );
 }