Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5940)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5941)
@@ -28,8 +28,14 @@
        much sense.
 
+   * mhcalib/MHCalibrationTestTimeCam.[h,cc]
+   * mhcalib/MHCalibrationTestCam.[h,cc]
+     - update to the latest changes in analysis chain.
+
+   * mjobs/MJExtractCalibTest.[h,cc]
+     - update to the latest changes in analysis chain.
+    
    * mjobs/MJCalibration.cc
      - replace title of that times-averageing Tab from "RelTimes" by 
        "Times".
-
 
  2005/01/21 Markus Gaug
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc	(revision 5940)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc	(revision 5941)
@@ -145,4 +145,6 @@
   SetHistYTitle(gsHistYTitle.Data());
 
+  SetLoGain(kFALSE);
+  
 }
 
@@ -165,4 +167,8 @@
 {
 
+  if (!InitCams(pList,"Test"))
+    return kFALSE;
+
+
   MCerPhotEvt *signal = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt");
   if (!signal)
@@ -178,4 +184,5 @@
 
   InitHiGainArrays(npixels,nareas,nsectors);
+  InitLoGainArrays(npixels,nareas,nsectors);
 
   fMeanMeanPhotPerArea.Set(nareas);   
@@ -184,78 +191,5 @@
   fRmsSigmaPhotPerArea.Set(nareas);
 
-  SetLoGain(kFALSE);
-  
   return kTRUE;
-}
-
-
-//--------------------------------------------------------------------------------------
-//
-// Initializes the High Gain Arrays:
-// 
-// - For every entry in the expanded arrays: 
-//   * Initialize an MHCalibrationPix
-//   * Set Binning from  fNbins, fFirst and fLast
-//   * Set Histgram names and titles from fHistName and fHistTitle
-//   * Set X-axis and Y-axis titles with fHistXTitle and fHistYTitle
-//   * Call InitHists
-//
-void MHCalibrationTestCam::InitHiGainArrays(const Int_t npixels, const Int_t nareas, const Int_t nsectors)
-{
-
-  if (fHiGainArray->GetSize()==0)
-  {
-      for (Int_t i=0; i<npixels; i++)
-      {
-        fHiGainArray->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainPix"),
-                                                 Form("%s%s",fHistTitle.Data()," High Gain Pixel")),i);
-        
-        MHCalibrationPix &pix = (*this)[i];          
-        pix.SetNbins(fNbins);
-        pix.SetFirst(fFirst);
-        pix.SetLast (fLast);
-        
-        MBadPixelsPix &bad = (*fBadPixels)[i];
-        InitHists(pix,bad,i);
-      }
-  }
-
-  if (!IsAverageing())
-    return;
-
-  if (fAverageHiGainAreas->GetSize()==0)
-  {
-    for (Int_t j=0; j<nareas; j++)
-      {
-        fAverageHiGainAreas->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainArea"),
-                                                        Form("%s%s",fHistTitle.Data()," High Gain Area Idx ")),j);
-        
-        MHCalibrationPix &pix = GetAverageHiGainArea(j);
-        
-        pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas));
-        pix.SetFirst(fFirst);
-        pix.SetLast (fLast);
-
-        pix.InitBins();
-        pix.SetEventFrequency(fPulserFrequency);
-      }
-  }
-
-  if (fAverageHiGainSectors->GetSize()==0)
-    {
-      for (Int_t j=0; j<nsectors; j++)
-        {
-          fAverageHiGainSectors->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainSector"),
-                                                            Form("%s%s",fHistTitle.Data()," High Gain Sector ")),j);
-          MHCalibrationPix &pix = GetAverageHiGainSector(j);
-
-          pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors));
-          pix.SetFirst(fFirst);
-          pix.SetLast (fLast);
-          
-          pix.InitBins();
-          pix.SetEventFrequency(fPulserFrequency);
-      }
-  }
 }
 
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.h
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.h	(revision 5940)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.h	(revision 5941)
@@ -36,6 +36,4 @@
   Bool_t FinalizeHists();
 
-  void InitHiGainArrays(const Int_t npix, const Int_t nareas, const Int_t nsectors);
-  
 public:
 
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc	(revision 5940)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc	(revision 5941)
@@ -110,5 +110,5 @@
 const Int_t   MHCalibrationTestTimeCam::fgNbins      = 600;
 const Axis_t  MHCalibrationTestTimeCam::fgFirst      = -0.5;
-const Axis_t  MHCalibrationTestTimeCam::fgLast       = 29.5;
+const Axis_t  MHCalibrationTestTimeCam::fgLast       = 14.5;
 const TString MHCalibrationTestTimeCam::gsHistName   = "TestTime";
 const TString MHCalibrationTestTimeCam::gsHistTitle  = "Calibrated Calibration Arrival Times";  
@@ -143,4 +143,6 @@
   SetHistXTitle(gsHistXTitle.Data());
   SetHistYTitle(gsHistYTitle.Data());
+
+  SetLoGain(kFALSE);
 
 }
@@ -159,4 +161,7 @@
 Bool_t MHCalibrationTestTimeCam::ReInitHists(MParList *pList)
 {
+
+  if (!InitCams(pList,""))
+    return kFALSE;
 
   MArrivalTime *signal = (MArrivalTime*)pList->FindObject("MArrivalTime");
@@ -172,6 +177,5 @@
 
   InitHiGainArrays(npixels,nareas,nsectors);
-
-  SetLoGain(kFALSE);
+  InitLoGainArrays(npixels,nareas,nsectors);
 
   return kTRUE;
Index: trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h	(revision 5940)
+++ trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h	(revision 5941)
@@ -48,4 +48,6 @@
   
   Display_t fDisplayType;                              // Chosen Display type
+
+  TString fGeometry;
   
   Bool_t ReadPedPhotCam();
@@ -54,9 +56,8 @@
   void   DisplayResultT(MParList &plist);
 
-  Bool_t WriteResultD();
-  Bool_t WriteResultT();
+  Bool_t WriteResult();
   
-  Bool_t ProcessFileD(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam);
-  Bool_t ProcessFileT(MPedestalCam &pedcam, MCalibrationRelTimeCam &relcam);  
+  Bool_t ProcessFile(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam, 
+		     MCalibrationRelTimeCam &rel, Byte_t filetype);
 
   Bool_t CheckEnv();
@@ -83,6 +84,6 @@
   void SetNormalDisplay()    { fDisplayType = kNormalDisplay;    }
   
-  Bool_t ProcessD(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam);
-  Bool_t ProcessT(MPedestalCam &pedcam, MCalibrationRelTimeCam &relcam);  
+  Bool_t Process(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam, 
+		 MCalibrationRelTimeCam &relcam,Byte_t filetype=1);
   
   ClassDef(MJExtractCalibTest, 0) // Tool to extract, calibrate and test the signal