Changeset 4942 for trunk/MagicSoft

Timestamp:

09/10/04 21:21:27 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationChargeCam.cc (modified) (10 diffs)
• MHCalibrationRelTimeCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -327 +327 @@
         pix.SetLast (fgChargeHiGainLast);
 
-        pix.GetHGausHist()->SetName ("HChargeHiGainPix");
-        pix.GetHGausHist()->SetTitle("Signals High Gain Pixel ");  
-        
+        TH1F *h =  pix.GetHGausHist();
+
+        h->SetName ("HChargeHiGainPix");
+        h->SetTitle("Signals High Gain Pixel ");  
+        h->SetXTitle("Signal [FADC counts]");
+        h->SetYTitle("Nr. of events");
+
         pix.GetHAbsTime()->SetName ("HAbsTimeHiGainPix");
         pix.GetHAbsTime()->SetTitle("Absolute Arrival Times High Gain Pixel ");  
@@ -354 +358 @@
           pix.SetLast (fgChargeLoGainLast);
           
-          pix.GetHGausHist()->SetName ("HChargeLoGainPix");
-          pix.GetHGausHist()->SetTitle("Signals Low Gain Pixel ");  
+          TH1F *h =  pix.GetHGausHist();
+          
+          h->SetName ("HChargeLoGainPix");
+          h->SetTitle("Signals Low Gain Pixel ");  
+          h->SetXTitle("Signal [FADC counts]");
+          h->SetYTitle("Nr. of events");
         
           pix.GetHAbsTime()->SetName ("HAbsTimeLoGainPix");
@@ -387 +395 @@
 
         MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageHiGainArea(j);
-
+        
         pix.SetAbsTimeNbins(higainsamples);
         pix.SetAbsTimeFirst(-0.5);
@@ -395 +403 @@
         pix.SetFirst(fgChargeHiGainFirst);
         pix.SetLast (fgChargeHiGainLast);
-
-        pix.GetHGausHist()->SetName ("HChargeHiGainAreaIdx");
-        pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis High Gain Area Idx ");
+        
+        TH1F *h =  pix.GetHGausHist();
+        
+        h->SetName ("HChargeHiGainAreaIdx");
+        h->SetXTitle("Signal [FADC counts]");
+        h->SetYTitle("Nr. of events");
         
         pix.GetHAbsTime()->SetName ("HAbsTimeHiGainAreaIdx");
         pix.GetHAbsTime()->SetTitle("Absolute Arrival Times average Hi Gain Area Idx ");  
-
+        
         if (fGeom->InheritsFrom("MGeomCamMagic"))
           {
-            pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signals averaged on event-by-event basis ",
-                                               j==0 ? "Inner Pixels " : "Outer Pixels ","High Gain Runs: "));
+            h->SetTitle(Form("%s%s%s","Signals averaged on event-by-event basis ",
+                             j==0 ? "Inner Pixels " : "Outer Pixels ","High Gain Runs: "));
             pix.InitBins();
             pix.SetEventFrequency(fPulserFrequency);
@@ -411 +422 @@
         else
           {
+            h->SetTitle("Signals averaged on event-by-event basis High Gain Area Idx ");
             InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
           }
       }
   }
-
-
+  
+  
   if (fAverageLoGainAreas->GetEntries()==0 && IsLoGain())
     {
@@ -436 +448 @@
         pix.SetLast(fgChargeLoGainLast);
 
-        pix.GetHGausHist()->SetName ("HChargeLoGainAreaIdx");
-        pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis Low Gain Area Idx ");
+        TH1F *h =  pix.GetHGausHist();
+        
+        h->SetName ("HChargeLoGainAreaIdx");
+        h->SetXTitle("Signal [FADC counts]");
+        h->SetYTitle("Nr. of events");
         
         pix.GetHAbsTime()->SetName ("HAbsTimeLoGainAreaIdx");
         pix.GetHAbsTime()->SetTitle("Absolute Arrival Times average Low Gain Area Idx ");  
-
         //
         // Adapt the range for the case, the intense blue is used:
@@ -459 +473 @@
         if (fGeom->InheritsFrom("MGeomCamMagic"))
           {
-            pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signals averaged on event-by-event basis ",
-                                               j==0 ? "Inner Pixels " : "Outer Pixels ","Low Gain Runs: "));
+            h->SetTitle(Form("%s%s%s","Signals averaged on event-by-event basis ",
+                             j==0 ? "Inner Pixels " : "Outer Pixels ","Low Gain Runs: "));
             pix.InitBins();
             pix.SetEventFrequency(fPulserFrequency);
@@ -466 +480 @@
         else
           {
+            h->SetTitle("Signals averaged on event-by-event basis Low Gain Area Idx ");
             InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
           }
@@ -490 +505 @@
           pix.SetLast (fgChargeHiGainLast);
 
-          pix.GetHGausHist()->SetName ("HChargeHiGainPix");
-          pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis HiGain Sector ");  
+          TH1F *h =  pix.GetHGausHist();
+          
+          h->SetName ("HChargeHiGainSector");
+          h->SetTitle("Signals averaged on event-by-event basis HiGain Sector ");  
+          h->SetXTitle("Signal [FADC counts]");
+          h->SetYTitle("Nr. of events");
         
           pix.GetHAbsTime()->SetName ("HAbsTimeHiGainPix");
@@ -519 +538 @@
           pix.SetLast (fgChargeLoGainLast);
 
-          pix.GetHGausHist()->SetName ("HChargeLoGainPix");
-          pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis LoGain Sector ");  
+          TH1F *h =  pix.GetHGausHist();
+          
+          h->SetName ("HChargeLoGainSector");
+          h->SetTitle("Signals averaged on event-by-event basis LoGain Sector ");  
+          h->SetXTitle("Signal [FADC counts]");
+          h->SetYTitle("Nr. of events");
         
           pix.GetHAbsTime()->SetName ("HAbsTimeLoGainPix");

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

@@ -261 +261 @@
         MHCalibrationPix &pix = GetAverageHiGainArea(j);
         
-        pix.SetNbins(fRelTimeNbins*3);
+        pix.SetNbins(fRelTimeNbins*TMath::Sqrt((Float_t)npixels/nareas));
         pix.SetFirst(fRelTimeFirst);
         pix.SetLast (fRelTimeLast);
@@ -298 +298 @@
         MHCalibrationPix &pix = GetAverageLoGainArea(j);
 
-        pix.SetNbins(fRelTimeNbins*3);
+        pix.SetNbins(fRelTimeNbins*TMath::Sqrt((Float_t)npixels/nareas));
         pix.SetFirst(fRelTimeFirst);
         pix.SetLast (fRelTimeLast);
@@ -335 +335 @@
           MHCalibrationPix &pix = GetAverageHiGainSector(j);
 
-          pix.SetNbins(fRelTimeNbins*3);
+          pix.SetNbins(fRelTimeNbins*TMath::Sqrt((Float_t)npixels/nsectors));
           pix.SetFirst(fRelTimeFirst);
           pix.SetLast (fRelTimeLast);
@@ -362 +362 @@
           MHCalibrationPix &pix = GetAverageLoGainSector(j);
 
-          pix.SetNbins(fRelTimeNbins*3);
+          pix.SetNbins(fRelTimeNbins*TMath::Sqrt((Float_t)npixels/nsectors));
           pix.SetFirst(fRelTimeFirst);
           pix.SetLast (fRelTimeLast);