Changeset 13598 for fact

Timestamp:

05/08/12 13:17:39 (12 years ago)

Author:

Jens Buss

Message:

resolved segmentation fold on producing test histograms

File:

• fact/tools/rootmacros/PulseTemplates/FPulseOverlay.C (modified) (11 diffs)

fact/tools/rootmacros/PulseTemplates/FPulseOverlay.C

@@ -180 +180 @@
 void ProduceDebugHistos( vector<Region> *pZXings);
 bool  UseThisPulse( int, int, int, int, int, int);
-void UpdateCanvases( int, int);
+void UpdateCanvases( int, int, bool);
 void DeletePixelCanvases( int, int );
 
@@ -196 +196 @@
         bool            debugPixel          = true,
         bool            testmode            = false,
-        bool            saveResults         = false,
+        bool            saveResults         = true,
         int             verbosityLevel      = 1,        // different verbosity levels can be implemented here
         int             firstevent          = 1,        // Hast to be between 1 and infinity NOT 0!!!!
-        int             nevents             = 10000,
+        int             nevents             = 100,
         int             firstpixel          = 15,
         int             npixel              = 3,
@@ -278 +278 @@
             cTitle   ="Distributions of Pulses with Order of: ";
             cTitle   += pulse_order;
-            cgpDistributions[pulse_order] = new TCanvas(cName,cTitle, 0,pulse_order*20,800,800);
+            cgpDistributions[pulse_order] = new TCanvas(cName,cTitle, 720,pulse_order*20,720,720);
             cgpDistributions[pulse_order]->Divide(2, 2);
             cName   ="cgpPixelPulses";
@@ -284 +284 @@
             cTitle   ="Overlays of Pulses with Order of: ";
             cTitle   += pulse_order;
-            cgpPixelPulses[pulse_order] = new TCanvas(cName,cTitle, 0,pulse_order*20,800,800);
+            cgpPixelPulses[pulse_order] = new TCanvas(cName,cTitle, 0,pulse_order*20,720,720);
             cgpPixelPulses[pulse_order]->Divide(2, 2);
         }
@@ -295 +295 @@
         if (spikeDebug)
         {
-          cFiltered = new TCanvas("cFiltered","filtered DRS Waveforms", 1,310,400,300);
+          cFiltered = new TCanvas("cFiltered","filtered DRS Waveforms", 1080,420,360,360);
           cFiltered->Divide(1, 3);
         }
 
+        if (testmode)
+        {
         //additional Test histograms
-        cgpTestHistos = new TCanvas( "cgpTestHistos", "Test Histograms", 801, 0, 800, 800 );
+        cgpTestHistos = new TCanvas( "cgpTestHistos", "Test Histograms", 360, 420, 360, 360 );
         cgpTestHistos->Divide(2,0);
+        }
     }
 
@@ -600 +603 @@
                             UpdateCanvases(
                                         verbosityLevel,
-                                        maxPulseOrder
+                                        maxPulseOrder,
+                                        testmode
                                         );
                         }
@@ -649 +653 @@
 
                 UpdateCanvases(
-                               verbosityLevel,
-                               maxPulseOrder
+                            verbosityLevel,
+                            maxPulseOrder,
+                            testmode
                                );
             }
@@ -709 +714 @@
         UpdateCanvases(
                     verbosityLevel,
-                    maxPulseOrder
+                    maxPulseOrder,
+                    testmode
                     );
 
@@ -723 +729 @@
                     verbosityLevel
                     );
-        delete      cgpTestHistos;
+
+        if (testmode)
+            delete      cgpTestHistos;
 
         if (spikeDebug)
@@ -976 +984 @@
 UpdateCanvases(
         int verbosityLevel,
-        int max_pulse_order
+        int max_pulse_order,
+        bool testmode
         )
 {
@@ -986 +995 @@
         cgpDistributions[pulse_order]->Modified();
         cgpDistributions[pulse_order]->Update();
-        cgpTestHistos->Modified();
-        cgpTestHistos->Update();
+        if ( testmode )
+        {
+            cgpTestHistos->Modified();
+            cgpTestHistos->Update();
+        }
     }
 }