From: Dennis Doering <doering@physik.uni-frankfurt.de>
Date: Tue, 25 Aug 2015 09:51:33 +0000 (+0200)
Subject: integrateSr90 in
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=67721a682bd6c36e0b2ef2b82eabdbe594b63814;p=radhard.git

integrateSr90 in
---

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index bf8ded8..29ee298 100644
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -142,10 +142,10 @@ void ChargeSpektrum(TString runnumber = "")
                                 
 //                 runs[runi]->analyzeFrame(15684);
 //                 runs[runi]->analyzeFrame(803316);
-//                 runs[runi]->analyzeFrame(8319);
-                
+             //    runs[runi]->analyzeFrame(734);
+       //           runs[runi]->analyzeFrame(4072);  
                 // creates or opens .root file, can analyze the RAW data
-                runs[runi]->error=runs[runi]->analyzeRun(false); // creates or opens .root file, can analyze the RAW data
+              runs[runi]->error=runs[runi]->analyzeRun(false); // creates or opens .root file, can analyze the RAW data
                 if (!runs[runi]->error)
                 {
             //         gROOT->SetBatch(kTRUE);
@@ -159,10 +159,10 @@ void ChargeSpektrum(TString runnumber = "")
                     //         runs[runi]->plotNoise();
                     if (!isBatch)
                         gROOT->SetBatch(kFALSE);
-                            runs[runi]->plotAllHistograms();
-//                    runs[runi]->plotAllHistogramsThresholdCluster();
-                    runs[runi]->plotAllHistogramsThresholdClusterCalibrated();
-                     runs[runi]->plotAllHistogramsCalibrated(); 
+              //              runs[runi]->plotAllHistograms();
+                    runs[runi]->plotAllHistogramsThresholdCluster();
+//                    runs[runi]->plotAllHistogramsThresholdClusterCalibrated();
+ //                    runs[runi]->plotAllHistogramsCalibrated(); 
                     runs[runi]->writeAllHistogramsToFile(); 
                 }
             }
@@ -172,5 +172,6 @@ void ChargeSpektrum(TString runnumber = "")
     plotAllRuns("seed calibrated");
 //     writeObservableToFile("seed threshold calibrated");
 //    writeObservableToFile("seed threshold");
-	writeObservableToFile("seed threshold calibrated");
+	writeObservableToFile("seed threshold");
+	writeObservableToFile("sum threshold");
 }
diff --git a/MABS_run_analyzer/MAPS.c b/MABS_run_analyzer/MAPS.c
index 6d21333..ff434a2 100644
--- a/MABS_run_analyzer/MAPS.c
+++ b/MABS_run_analyzer/MAPS.c
@@ -1642,7 +1642,7 @@ void MAPS::hitana() {
                     }
                     // if(fFrameInfo.pixelthreshold[fHits]!=0)
 					// {
-						
+						// cout<<"Charge"<<chargesumincluster4<<"must bigger than NOISE"<<noisesumincluster4*6.0<<endl;
 					       // debugStream<>(fHittedPixel, fPixels, fColumns, 1, 1);
 						// for(Int_t row=0; row<5; row++)
 						// {
diff --git a/MABS_run_analyzer/Run.c b/MABS_run_analyzer/Run.c
index 41b31cf..959df9e 100644
--- a/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@ -98,7 +98,6 @@ Run::Run(Int_t runnumber, Int_t loopi)
             labbook.CCE_in_Perc_1DB = (rowsql->GetField(17) != NULL)?atoi(rowsql->GetField(17)):-1;
             labbook.CCE_in_Perc_25DB = (rowsql->GetField(18) != NULL)?atoi(rowsql->GetField(18)):-1;
             labbook.frames_foundDB = (rowsql->GetField(19) != NULL)?atoi(rowsql->GetField(19)):-1;
-		//	labbook.frames_Analyzed = (rowsql->GetField(20) != NULL)?atoi(rowsql->GetField(20)):-1;
             delete res;
             if (labbook.chip.Length() > 0 && labbook.chipGen.Length() > 0) // versuche infos zum Chip aus der ChipDatenbank zu bekommen
             {
@@ -244,7 +243,7 @@ Bool_t Run::analyzeRun(Bool_t force)
             processed->InitialDynNoise();
             int start   = 0;
             int nframes = processed->GetNumberFrames();
-         //    for(int i=0; i<1000000;i++) // TODO remove 100000 run 342272
+          //   for(int i=0; i<1000;i++) // TODO remove 100000 run 342272
            for(int i=0; i<nframes;i++) // TODO remove 100000 run 342272
             {
 //                 cout << "getframe " << i << endl;
@@ -284,11 +283,11 @@ Bool_t Run::analyzeRun(Bool_t force)
         histogramthresholdCalibrated.calibrated = histogramCalibrated.calibrated;
         cout << colorwhite << "calculateCCE():" << endlr;
         calculteCCE();
-    /*    if (labbook.source.Contains("Sr90")) {
+        if (labbook.source.Contains("Sr90")) {
             cout << colorwhite << "integrateSr90Spectra():" << endlr;
             integrateSr90Spectra(histogramthresholdCalibrated.Seed);
         }
-	*/	
+		
         cout << colorwhite << "updateDatabase():" << endlr;
         updateDatabase();
         cout << colorwhite << "delete MAPS class:" << endlr;