Changeset 14658

Timestamp:

11/19/12 11:55:18 (12 years ago)

Author:

Jens Buss

Message:

bugfix: pedestal readout in correct place no segfault

File:

• fact/tools/marsmacros/mc2csv/MonteCarlo.C (modified) (10 diffs)

fact/tools/marsmacros/mc2csv/MonteCarlo.C

@@ -116 +116 @@
     mNumberOfEvents = 2;
 
-    mVerbosityLvl   = 2;
+    mVerbosityLvl   = 3;
 
     return;
@@ -209 +209 @@
         mpHeaderTree->SetBranchAddress("MGeomCam.",         &mpGeomCam);
     }
+    else cout << "...could not load branch: MGeomCam" << endl;
 
     // -----------------------------------------------------------------------
@@ -218 +219 @@
         mpHeaderTree->SetBranchAddress("IntendedPulsePos.", &mpIntendedPulsePos);
     }
+    else cout << "...could not load branch: IntendedPulsePos" << endl;
 
     // -----------------------------------------------------------------------
@@ -227 +229 @@
         mpHeaderTree->SetBranchAddress("MMcRunHeader.",     &mpMcRunHeader);
     }
+    else cout << "...could not load branch: MMcRunHeader" << endl;
 
     // -----------------------------------------------------------------------
@@ -236 +239 @@
         mpHeaderTree->SetBranchAddress("ElectronicNoise.",  &mpElectronicNoise);
     }
+    else cout << "...could not load branch: ElectronicNoise" << endl;
 
     // -----------------------------------------------------------------------
@@ -245 +249 @@
         mpHeaderTree->SetBranchAddress("MRawRunHeader.",    &mpRawRunHeader);
     }
+    else cout << "...could not load branch: MRawRunHeader" << endl;
 
     // -----------------------------------------------------------------------
@@ -254 +259 @@
         mpHeaderTree->SetBranchAddress("MCorsikaRunHeader.",&mpCorsikaRunHeader);
     }
+    else cout << "...could not load branch: MCorsikaRunHeader" << endl;
 
     // =======================================================================
@@ -350 +356 @@
     else if (mVerbosityLvl > 2)
         cout << "...could not read data from: MCorsikaRunHeader" << endl;
+
+    // -----------------------------------------------------------------------
+
+    // delete Pixel Array before you set refferences for a new one
+    if (mpPixel != NULL)
+    {
+        delete[] mpPixel;
+    }
+    mpPixel = new pixel_t[mNumberOfPixels];
+
+    // -----------------------------------------------------------------------
+
+    //Get Pedestal from "ElectronicNoise" Branch
+    if ( mpElectronicNoise != NULL)
+    {
+        if (mVerbosityLvl > 1) cout << "   ...reading pedestal offsets" << endl;
+
+        // Read Pedestal Offset
+        for ( int i = 0; i < mNumberOfPixels; i++ )
+        {
+            if ( &(mpElectronicNoise[0][i]) != NULL)
+                mpPixel[i].pedestal   = mpElectronicNoise[0][i].GetPedestal();
+            else if (mVerbosityLvl > 2)
+                cout << "   ...cannot read pedestal offset" << endl;
+        }
+    }
+    else if (mVerbosityLvl > 2)
+        cout << "...could not read data from: ElectronicNoise" << endl;
 
     return;
@@ -844 +878 @@
 MonteCarlo::WritePedestalInfo2Csv()
 {
-    mCsv << "### [Pedestal info]" << endl;
-    mCsv << "# SoftID" ;
-    mCsv << mSeparator ;
-    mCsv << "Pedestal" << endl;
+    mCsv << "### [Pedestal]" << endl;
+//    mCsv << "# SoftID" ;
+//    mCsv << mSeparator ;
+//    mCsv << "Pedestal" << endl;
 }
 
@@ -857 +891 @@
     for (int pixelID = 0; pixelID < mNumberOfPixels; pixelID++)
     {
-        mCsv << mpPixel[pixelID].SoftId;
-        mCsv << mSeparator;
+//        mCsv << mpPixel[pixelID].SoftId;
         mCsv << mpPixel[pixelID].pedestal;
-        mCsv << endl;
+        if (pixelID < mNumberOfPixels -1)
+            mCsv << mSeparator;
     }
     mCsv << endl;