Changeset 13520

Timestamp:

05/02/12 17:23:19 (13 years ago)

Author:

Jens Buss

Message:

update some bugfixes in the destructor

File:

• fact/tools/rootmacros/PulseTemplates/pixel.C (modified) (7 diffs)

fact/tools/rootmacros/PulseTemplates/pixel.C

@@ -66 +66 @@
 Pixel::~Pixel()
 {
-    if (mVerbosityLevel > 2) cout << endl << "...delete current pixel histograms" ;
+    if (mVerbosityLevel > 1) cout << endl << "...delete histograms of pixel " << mChid ;
 
     DeletePixelHistos();
     DeleteDistributionHistos();
+
     delete hList;
     hList = NULL;
@@ -358 +359 @@
         )
 {
+    cout << endl << "Saving histograms of Pixel# " << mChid
+         << " Adress " << &mChid;
     if (!saveResults) return;
+    cout << endl << "#### ";
     SaveHistograms(
             outRootFileName,
@@ -374 +378 @@
 {
     if (mVerbosityLevel > 2) cout << endl << "\t...delete current overlay histograms" ;
-
-    for (int order = 0;
-         order < mMaxPulseOrder;
-         order ++)
-    {
-        if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hMaxOverlay";
-        delete hMaxOverlay[order];
-
-        if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hEdgeOverlay";
-        delete hEdgeOverlay[order];
-
-        if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hMaxProfile";
-        delete hMaxProfile[order];
-
-        if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hMaxProfile2";
-        delete hEdgeProfile[order];
-    }
+    cout << endl << "Deleting histograms of Pixel# " << mChid
+         << " Adress " << &mChid;
+//    for (int order = 0;
+//         order < mMaxPulseOrder;
+//         order ++)
+//    {
+////        if (mVerbosityLevel > 3)
+//        cout << endl << "\t\t...deleting hMaxOverlay"
+//                                      << mChid << "_" << order
+//                                      << " hMaxOverlay[order] adr " << hMaxOverlay[order]
+//                                      << " hMaxOverlay adr " << hMaxOverlay
+//                                         ;
+
+//        delete hMaxOverlay[order];
+//        hMaxOverlay[order] = NULL;
+
+//        if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hEdgeOverlay"
+//                                      << mChid << "_" << order ;
+//        delete hEdgeOverlay[order];
+//        hEdgeOverlay[order] = NULL;
+
+//        if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hMaxProfile"
+//                                      << mChid << "_" << order ;
+//        delete hMaxProfile[order];
+//        hMaxProfile[order] = NULL;
+
+//        if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hMaxProfile2"
+//                                      << mChid << "_" << order ;
+//        delete hEdgeProfile[order];
+//        hEdgeProfile[order] = NULL;
+//    }
     if (mVerbosityLevel > 3) cout << endl << "\t...deleting histogram Arrays";
+
+    if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hMaxOverlay";
     delete[] hMaxOverlay;
     hMaxOverlay = NULL;
 
+    if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hEdgeOverlay";
     delete[] hEdgeOverlay;
     hEdgeOverlay = NULL;
 
+    if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hMaxProfile";
     delete[] hMaxProfile;
     hMaxProfile = NULL;
 
+    if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hEdgeProfile";
     delete[] hEdgeProfile;
     hEdgeProfile = NULL;
@@ -413 +436 @@
                                   << "\t...delete current distribution histograms" ;
 
-    for (int order = 0;
-         order < mMaxPulseOrder;
-         order ++)
-    {
-        if (mOptions.Contains("S"))
-        {
-            if (mVerbosityLevel > 3) cout << endl
-                                          << "\t\t...deleting hSlopeRisingEdge"
-                                          << mChid << "_" << order ;
-            delete hSlopeRisingEdge[order];
-        }
-
-        if (mOptions.Contains("R"))
-        {
-            if (mVerbosityLevel > 3) cout << endl
-                                          << "\t\t...deleting hRisingEdgeToMax"
-                                          << mChid << "_" << order ;
-//            delete hRisingEdgeToMax[order];
-        }
-
-        if (mOptions.Contains("P"))
-        {
-            if (mVerbosityLevel > 3) cout << endl
-                                          << "\t\t...deleting hPosOfMax"
-                                          << mChid << "_" << order ;
-
-//            delete hPosOfMax[order];
-        }
-
-    }
+//    for (int order = 0;
+//         order < mMaxPulseOrder;
+//         order ++)
+//    {
+//        if (mOptions.Contains("S"))
+//        {
+//            if (mVerbosityLevel > 3) cout << endl
+//                                          << "\t\t...deleting hSlopeRisingEdge"
+//                                          << mChid << "_" << order ;
+//            delete hSlopeRisingEdge[order];
+//        }
+
+//        if (mOptions.Contains("R"))
+//        {
+//            if (mVerbosityLevel > 3) cout << endl
+//                                          << "\t\t...deleting hRisingEdgeToMax"
+//                                          << mChid << "_" << order ;
+////            delete hRisingEdgeToMax[order];
+//        }
+
+//        if (mOptions.Contains("P"))
+//        {
+//            if (mVerbosityLevel > 3) cout << endl
+//                                          << "\t\t...deleting hPosOfMax"
+//                                          << mChid << "_" << order ;
+
+////            delete hPosOfMax[order];
+//        }
+
+//    }
     if (mVerbosityLevel > 3) cout << endl << "\t...deleting histogram Arrays";
 
@@ -448 +471 @@
     {
         if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hSlopeRisingEdge";
-//        delete[] hSlopeRisingEdge;
+        delete[] hSlopeRisingEdge;
         hSlopeRisingEdge = NULL;
     }
@@ -455 +478 @@
     {
         if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hRisingEdgeToMax";
-//        delete[] hRisingEdgeToMax;
+        delete[] hRisingEdgeToMax;
         hRisingEdgeToMax = NULL;
     }
@@ -462 +485 @@
     {
         if (mVerbosityLevel > 3) cout << endl << "\t\t...deleting hPosOfMax";
-//        delete[] hPosOfMax;
+        delete[] hPosOfMax;
         hPosOfMax = NULL;
     }