Changeset 5941


Ignore:
Timestamp:
01/22/05 15:52:23 (20 years ago)
Author:
mazin
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r5940 r5941  
    2828       much sense.
    2929
     30   * mhcalib/MHCalibrationTestTimeCam.[h,cc]
     31   * mhcalib/MHCalibrationTestCam.[h,cc]
     32     - update to the latest changes in analysis chain.
     33
     34   * mjobs/MJExtractCalibTest.[h,cc]
     35     - update to the latest changes in analysis chain.
     36   
    3037   * mjobs/MJCalibration.cc
    3138     - replace title of that times-averageing Tab from "RelTimes" by
    3239       "Times".
    33 
    3440
    3541 2005/01/21 Markus Gaug
  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc

    r5137 r5941  
    145145  SetHistYTitle(gsHistYTitle.Data());
    146146
     147  SetLoGain(kFALSE);
     148 
    147149}
    148150
     
    165167{
    166168
     169  if (!InitCams(pList,"Test"))
     170    return kFALSE;
     171
     172
    167173  MCerPhotEvt *signal = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt");
    168174  if (!signal)
     
    178184
    179185  InitHiGainArrays(npixels,nareas,nsectors);
     186  InitLoGainArrays(npixels,nareas,nsectors);
    180187
    181188  fMeanMeanPhotPerArea.Set(nareas);   
     
    184191  fRmsSigmaPhotPerArea.Set(nareas);
    185192
    186   SetLoGain(kFALSE);
    187  
    188193  return kTRUE;
    189 }
    190 
    191 
    192 //--------------------------------------------------------------------------------------
    193 //
    194 // Initializes the High Gain Arrays:
    195 //
    196 // - For every entry in the expanded arrays:
    197 //   * Initialize an MHCalibrationPix
    198 //   * Set Binning from  fNbins, fFirst and fLast
    199 //   * Set Histgram names and titles from fHistName and fHistTitle
    200 //   * Set X-axis and Y-axis titles with fHistXTitle and fHistYTitle
    201 //   * Call InitHists
    202 //
    203 void MHCalibrationTestCam::InitHiGainArrays(const Int_t npixels, const Int_t nareas, const Int_t nsectors)
    204 {
    205 
    206   if (fHiGainArray->GetSize()==0)
    207   {
    208       for (Int_t i=0; i<npixels; i++)
    209       {
    210         fHiGainArray->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainPix"),
    211                                                  Form("%s%s",fHistTitle.Data()," High Gain Pixel")),i);
    212        
    213         MHCalibrationPix &pix = (*this)[i];         
    214         pix.SetNbins(fNbins);
    215         pix.SetFirst(fFirst);
    216         pix.SetLast (fLast);
    217        
    218         MBadPixelsPix &bad = (*fBadPixels)[i];
    219         InitHists(pix,bad,i);
    220       }
    221   }
    222 
    223   if (!IsAverageing())
    224     return;
    225 
    226   if (fAverageHiGainAreas->GetSize()==0)
    227   {
    228     for (Int_t j=0; j<nareas; j++)
    229       {
    230         fAverageHiGainAreas->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainArea"),
    231                                                         Form("%s%s",fHistTitle.Data()," High Gain Area Idx ")),j);
    232        
    233         MHCalibrationPix &pix = GetAverageHiGainArea(j);
    234        
    235         pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas));
    236         pix.SetFirst(fFirst);
    237         pix.SetLast (fLast);
    238 
    239         pix.InitBins();
    240         pix.SetEventFrequency(fPulserFrequency);
    241       }
    242   }
    243 
    244   if (fAverageHiGainSectors->GetSize()==0)
    245     {
    246       for (Int_t j=0; j<nsectors; j++)
    247         {
    248           fAverageHiGainSectors->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainSector"),
    249                                                             Form("%s%s",fHistTitle.Data()," High Gain Sector ")),j);
    250           MHCalibrationPix &pix = GetAverageHiGainSector(j);
    251 
    252           pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors));
    253           pix.SetFirst(fFirst);
    254           pix.SetLast (fLast);
    255          
    256           pix.InitBins();
    257           pix.SetEventFrequency(fPulserFrequency);
    258       }
    259   }
    260194}
    261195
  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.h

    r5479 r5941  
    3636  Bool_t FinalizeHists();
    3737
    38   void InitHiGainArrays(const Int_t npix, const Int_t nareas, const Int_t nsectors);
    39  
    4038public:
    4139
  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc

    r5137 r5941  
    110110const Int_t   MHCalibrationTestTimeCam::fgNbins      = 600;
    111111const Axis_t  MHCalibrationTestTimeCam::fgFirst      = -0.5;
    112 const Axis_t  MHCalibrationTestTimeCam::fgLast       = 29.5;
     112const Axis_t  MHCalibrationTestTimeCam::fgLast       = 14.5;
    113113const TString MHCalibrationTestTimeCam::gsHistName   = "TestTime";
    114114const TString MHCalibrationTestTimeCam::gsHistTitle  = "Calibrated Calibration Arrival Times"; 
     
    143143  SetHistXTitle(gsHistXTitle.Data());
    144144  SetHistYTitle(gsHistYTitle.Data());
     145
     146  SetLoGain(kFALSE);
    145147
    146148}
     
    159161Bool_t MHCalibrationTestTimeCam::ReInitHists(MParList *pList)
    160162{
     163
     164  if (!InitCams(pList,""))
     165    return kFALSE;
    161166
    162167  MArrivalTime *signal = (MArrivalTime*)pList->FindObject("MArrivalTime");
     
    172177
    173178  InitHiGainArrays(npixels,nareas,nsectors);
    174 
    175   SetLoGain(kFALSE);
     179  InitLoGainArrays(npixels,nareas,nsectors);
    176180
    177181  return kTRUE;
  • trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.h

    r4742 r5941  
    4848 
    4949  Display_t fDisplayType;                              // Chosen Display type
     50
     51  TString fGeometry;
    5052 
    5153  Bool_t ReadPedPhotCam();
     
    5456  void   DisplayResultT(MParList &plist);
    5557
    56   Bool_t WriteResultD();
    57   Bool_t WriteResultT();
     58  Bool_t WriteResult();
    5859 
    59   Bool_t ProcessFileD(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam);
    60   Bool_t ProcessFileT(MPedestalCam &pedcam, MCalibrationRelTimeCam &relcam); 
     60  Bool_t ProcessFile(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam,
     61                     MCalibrationRelTimeCam &rel, Byte_t filetype);
    6162
    6263  Bool_t CheckEnv();
     
    8384  void SetNormalDisplay()    { fDisplayType = kNormalDisplay;    }
    8485 
    85   Bool_t ProcessD(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam);
    86   Bool_t ProcessT(MPedestalCam &pedcam, MCalibrationRelTimeCam &relcam); 
     86  Bool_t Process(MPedestalCam &pedcam, MCalibrationChargeCam &calcam, MCalibrationQECam &qecam,
     87                 MCalibrationRelTimeCam &relcam,Byte_t filetype=1);
    8788 
    8889  ClassDef(MJExtractCalibTest, 0) // Tool to extract, calibrate and test the signal
Note: See TracChangeset for help on using the changeset viewer.