Analyzer: adjustments to custom class TH1FO 2

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index f0f55ca94e9453abfdeeaa03375ce9b934b1b9b2..83d8071387332032dc445e9e01016dd01ad07917 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -26,7 +26,23 @@ Int_t numberRuns;
 #include "ChargeSpektrumFunctions.cpp"
 
 void ChargeSpektrum(TString runnumber = "")
-{
+{    
+//     TH1FO* averageF0PixelwiseStart = new TH1FO(Form("%d AvgF0 per Pixel, first 1000 frames",1), Form("%d Average F0 per Pixel, first 1000 frames",1), 100, 0, 100 * 100);  
+//     TH1F* averageF0PixelwiseStart2 = new TH1F(Form("%d AvgF0 per Pixel, first 1000 frames",1), Form("%d Average F0 per Pixel, first 1000 frames",1), 100, 0, 100 * 100);  
+//     //     cout << colorcyan << "Before clone" << endlr;
+//     TH1FO* averageF0PixelwiseEnd = (TH1FO*)averageF0PixelwiseStart->Clone();
+//     //     cout << colorcyan << "After clone" << endlr;
+//     cout << colorcyan << averageF0PixelwiseStart->itsHistogramType << endlr;
+//     cout << colorcyan << averageF0PixelwiseEnd->itsHistogramType << endlr;
+// //     averageF0PixelwiseEnd->itsHistogramType = histogram;  
+//     cout << colorcyan << sizeof(*averageF0PixelwiseStart) << endlr;
+//     cout << colorcyan << sizeof(*averageF0PixelwiseStart2) << endlr;
+//     cout << colorcyan << sizeof(*averageF0PixelwiseEnd) << endlr;
+//     cout << colorcyan << averageF0PixelwiseEnd->GetName() << endlr;
+//     
+//     return;
+    
+    
     cout << endl << endl;
     if (gROOT->IsBatch())
         isBatch = kTRUE;
@@ -488,7 +504,7 @@ void ChargeSpektrum(TString runnumber = "")
                         }
                         
                         
-                        
+               
                         
                         // write all histograms to a dat file, can be imported by ORIGIN or Excel. Leave this line ;)
                         runs[runi]->writeAllHistogramsToFile();
@@ -521,7 +537,6 @@ void ChargeSpektrum(TString runnumber = "")
         plot1DData(&(*curNtupleVector));
     }
     
-    
     // Don't change this
     gROOT->SetBatch(kTRUE);
     plotAllRuns(&compareHistogramClassVectorMABSBot, kTRUE, kTRUE);

diff --git a/MABS_run_analyzer/HistogramType.cpp b/MABS_run_analyzer/HistogramType.cpp
index a405afbb9273498d0f716d850a1d2a99ae80b4ce..efc35c42e3d99d1694e361ac519a31b8a02ae686 100644 (file)
--- a/MABS_run_analyzer/HistogramType.cpp
+++ b/MABS_run_analyzer/HistogramType.cpp
@@ -16,7 +16,27 @@ using namespace std;
 //*****************
 
 HistogramType::~HistogramType( void) {
-    
+//     delete(Seed);
+//     delete(Sum);
+//     delete(Sum9);
+//     delete(Sum25);
+//     for (unsigned int i=0; i < a_Sum25.size(); ++i) {
+//         delete( a_Sum25[i]);
+//     }
+//     for (unsigned int i=0; i < a_Sum9.size(); ++i) {
+//         delete( a_Sum9[i]);
+//     }
+//     delete(Veto );
+//     delete(Noise );
+//     delete(NoiseEnd);
+//     delete(histAvgCluster );
+//     delete(SeedPerc);
+//     delete(pixeltimefired);
+//     delete(pixeltimefiredDistrib);
+//     delete(LeakageCurrentInPixel);
+//     delete(LeakageCurrentInPixelSorted);
+//     delete(LeakageCurrentDistrib);    
+//     delete(pixelHadGoodVeto);
 }
 
 HistogramType::HistogramType(TString suffix, systemparam* gotsystempar, sensorinfostruct* gotsensorinfo, TString gothumanreadablestr, labbooksctruct* plabbook, Run* runpointer, Int_t gotcolor, Int_t gotstyle ) {
@@ -116,7 +136,13 @@ void HistogramType::initHistogramCustom(TH1FO* &histogrampointer, TString prefix
 void HistogramType::initHistogramArray(vector<TH1FO*>* histogramarraypointer, int numberofhisto, TString prefix, Int_t color, Int_t style) {
     for (int i=0; i < numberofhisto; ++i) {
 //         TH1FO* histogrampointer = (TH1FO*)new TH1F(Form("%d %s %d",labbook->runnumber, prefix.Data(), i+1), Form("%s %d, %s",prefix.Data(), i+1, humanreadablestr.Data()), cursystempar->nbins, 0, cursystempar->maxbin);
+        cout << colorcyan << i << endlr;
+        cout << colorcyan << Form("%d %s %d",labbook->runnumber, prefix.Data(), i+1) << endlr;
+        cout << colorcyan << Form("%s %d",prefix.Data(), i+1) << endlr;
+        cout << colorcyan << cursystempar->nbins << endlr;
+        cout << colorcyan << cursystempar->maxbin << endlr;
         TH1FO* histogrampointer = new TH1FO(Form("%d %s %d",labbook->runnumber, prefix.Data(), i+1), Form("%s %d",prefix.Data(), i+1), cursystempar->nbins, 0, cursystempar->maxbin);  
+        cout << colorcyan << i << endlr;
         histogrampointer->SetLineStyle(style);
         histogrampointer->SetLineColor(color);
         histogrampointer->SetStats(kTRUE);        

diff --git a/MABS_run_analyzer/Run.cpp b/MABS_run_analyzer/Run.cpp
index bb36e8493c1b0ee286f72ae57573d189343a6dd7..bdf03958aa68e254d8a9e3022f7091ff357c4b9d 100644 (file)
--- a/MABS_run_analyzer/Run.cpp
+++ b/MABS_run_analyzer/Run.cpp
@@ -17,6 +17,15 @@ using namespace std;
 Run::~Run( void)
 {
     db->Close();
+//     delete(histogram);
+//     delete(histogramthreshold);
+//     delete(histogramfixedthreshold);
+//     delete(histogramdynamicalthreshold);
+//     delete(histogramwoRTS);
+//     delete(histogramwoRTSthreshold);
+//     delete(histogramwoRTSAggresive);
+//     delete(histogramwoRTSAggresivethreshold);
+//     delete(histogramGoodVeto);
     cout << "gelöscht Run" << endl;
 }
 

diff --git a/MABS_run_analyzer/help.h b/MABS_run_analyzer/help.h
index d0b851075ac831e173b984d832f6160ad29c2fde..abae5e664280a31c09b85ddbe32c4d784cae239e 100644 (file)
--- a/MABS_run_analyzer/help.h
+++ b/MABS_run_analyzer/help.h
@@ -210,19 +210,18 @@ public:
     TH1FO(): TH1F() {};
     
     TH1FO(const char *name,const char *title,Int_t nbins,Double_t xlow,Double_t xup):
-    TH1F(name,title,nbins,xlow,xup), itsHistogramType(0){};
+    TH1F(name,title,nbins,xlow,xup){ cout << "constructor" << endl;};
     
     TH1FO(const char *name,const char *title,Int_t nbins,const Float_t *xbins):
-    TH1F(name,title,nbins,xbins), itsHistogramType(0){ };
+    TH1F(name,title,nbins,xbins){ };
     
     TH1FO(const char *name,const char *title,Int_t nbins,const Double_t *xbins):
-    TH1F(name,title,nbins,xbins), itsHistogramType(0) { };
+    TH1F(name,title,nbins,xbins){ };
     
     ////////////////////////////////////////////////////////////////////////////////
     /// Destructor.    
     virtual ~TH1FO()
     {
-        itsHistogramType = 0;
     }
     
     ////////////////////////////////////////////////////////////////////////////////