Changeset 3904 for trunk/MagicSoft/Mars

Timestamp:

04/30/04 13:21:40 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationCam.cc (modified) (1 diff)
• mcalib/MHCalibrationRelTimeCam.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
   
    * mcalib/MHCalibrationCam.[h,cc]
-   * mcalib/MHCalibrationRelTimeCam.[h,cc]
-   * mcalib/MHCalibrationChargeCam.[h,cc]
      - retrieve the used run numbers in order to store them in teh 
        histogram titles to help transparency of the displays

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc

@@ -498 +498 @@
     fRunNumbers[fRunNumbers.GetSize()-1] = fRunHeader->GetRunNumber();
 
-  return ReInitHists(pList);
-}
+  if (!ReInitHists(pList))
+    return kFALSE;
+
+  if (!fRunHeader)
+    return kTRUE;
+  
+  for (Int_t i=0; i<fHiGainArray->GetEntries(); i++)
+    {
+      TH1F *h = (*this)[i].GetHGausHist();
+      h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
+    }
+
+  for (Int_t i=0; i<fLoGainArray->GetEntries(); i++)
+    {
+      TH1F *h = (*this)(i).GetHGausHist();
+      h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
+    }
+  
+  for (Int_t j=0; j<nareas; j++)
+    {
+      TH1F *h = GetAverageHiGainArea(j).GetHGausHist();
+      h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
+    }
+  
+  for (Int_t j=0; j<nareas; j++)
+    {
+      TH1F *h = GetAverageLoGainArea(j).GetHGausHist();
+      h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
+    }
+  
+  for (Int_t j=0; j<nsectors; j++)
+    {
+      TH1F *h = GetAverageHiGainSector(j).GetHGausHist();
+      h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
+    }
+  
+  for (Int_t j=0; j<nsectors; j++)
+    {
+      TH1F *h = GetAverageLoGainSector(j).GetHGausHist();
+      h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
+    }
+
+  return kTRUE;
+}
+
 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc

@@ -194 +194 @@
   }
   
-  if (fRunHeader)
-    for (Int_t i=0; i<npixels; i++)
-      {
-        TH1F *h = (*this)[i].GetHGausHist();
-          h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
-      }
   
   if (fLoGainArray->GetEntries()==0)
@@ -212 +206 @@
   }
 
-  if (fRunHeader)
-    for (Int_t i=0; i<npixels; i++)
-      {
-        TH1F *h = (*this)(i).GetHGausHist();
-        h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
-      }
 
   if (fAverageHiGainAreas->GetEntries()==0)
@@ -236 +224 @@
   }
 
-  if (fRunHeader)
-    for (Int_t j=0; j<nareas; j++)
-      {
-        TH1F *h = GetAverageHiGainArea(j).GetHGausHist();
-        h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
-      }
-  
   if (fAverageLoGainAreas->GetEntries()==0)
   {
@@ -259 +240 @@
       }
   }
-  
-  if (fRunHeader)
-    for (Int_t j=0; j<nareas; j++)
-        {
-          TH1F *h = GetAverageLoGainArea(j).GetHGausHist();
-          h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
-        }
   
   if (fAverageHiGainSectors->GetEntries()==0)
@@ -284 +258 @@
   }
   
-  if (fRunHeader)
-    for (Int_t j=0; j<nsectors; j++)
-      {
-        TH1F *h = GetAverageHiGainSector(j).GetHGausHist();
-        h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
-      }
-
   if (fAverageLoGainSectors->GetEntries()==0)
     {
@@ -309 +276 @@
     }
 
-  if (fRunHeader)
-    for (Int_t j=0; j<nsectors; j++)
-      {
-        TH1F *h = GetAverageLoGainSector(j).GetHGausHist();
-        h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
-      }
-  
   return kTRUE;
 }