Changeset 6828 for trunk


Ignore:
Timestamp:
03/16/05 13:27:32 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r6824 r6828  
    2121
    2222                                                 -*-*- END OF LINE -*-*-
     23 2005/03/16 Thomas Bretz
     24
     25   * callisto.cc:
     26     - set changed extractor in MJCalibrateSignal from MJPedestal
     27
     28   * callisto.rc:
     29     - removed obsolete Modified* option
     30
     31   * mjobs/MJCalibrateSignal.[h,cc]:
     32     - removed obsolete flag for ModifiedExtractWin
     33
     34
     35   * mcalib/MCalibColorSet.cc, mcalib/MCalibrationChargeCalc.cc,
     36     mhcalib/MHCalibrationCam.cc:
     37     - undocummented change
     38
     39
     40
     41 2005/03/15 Markus Gaug
     42
     43   * msignal/MExtractTimeAndChargeSpline.h
     44     - take fRandomIter out of the streamer.
     45     - take fRiseTimeLoGain and fFallTimeLoGain into the streamer.
     46     - raise version number to 4
     47
     48   * mjobs/MJCalibration.cc
     49     - set default to kFALSE for PIN Diode or Blind Pixel calibration
     50       (was kTRUE by error).
     51
     52
     53
    2354 2005/03/15 Thomas Bretz
    2455

  • trunk/MagicSoft/Mars/callisto.cc

    r6752 r6828  
    576576        job4.SetPathData(kInpathD);
    577577        job4.SetDataType(kDataType);
     578        job4.SetExtractor(job2.GetExtractor());
    578579
    579580        // Where to search for calibration files

  • trunk/MagicSoft/Mars/callisto.rc

    r6822 r6828  
    310310#MJPedestalY2.ExtractWinLeft:  2.5
    311311#MJPedestalY2.ExtractWinRight: 5.0
    312 #MJCalibrateSignal.ModifiedExtractWin: yes
     312
    313313# -------------------------------------------------------------------------
    314314# Define the Pulse Position check parameters:

  • trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc

    r6361 r6828  
    316316      return kFALSE;
    317317      break;
    318      
     318
     319    case 40493:
    319320    case 45116:
    320321    case 45609:
    321322    case 45219:
    322       *fLog << err << "Sorry, run " << num << " was taken with a combination of colours used to flat-field ";
     323      *fLog << err << dec << "Sorry, run " << num
     324            << " was taken with a combination of colours used to flat-field ";
    323325      *fLog << err << "the camera. It cannot be used for the standard calibration " << endl;
    324326      return kFALSE;

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

    r6393 r6828  
    588588          *fLog << warn << "Multiple colours used simultaneously!" ;
    589589          fHCam->Finalize();
    590           fHBlindCam->Finalize();
     590          if (fHBlindCam)
     591            fHBlindCam->Finalize();
    591592
    592593          Finalize();
    593594
    594595          fHCam->ResetHists();
    595           fHBlindCam->ResetHists();
     596          if (fHBlindCam)
     597            fHBlindCam->ResetHists();
    596598
    597599          *fLog << inf << "Starting next calibration... " << flush;
    598600
    599601          fHCam->SetColor(col);
    600           fHBlindCam->SetColor(col);
     602          if (fHBlindCam)
     603            fHBlindCam->SetColor(col);
    601604
    602605          fCam->SetPulserColor(col);
    … …  
    623626 
    624627  fHCam->SetColor(col);
    625   fHBlindCam->SetColor(col);
     628  if (fHBlindCam)
     629    fHBlindCam->SetColor(col);
    626630
    627631  MCalibrationBlindCam  *blindcam  = fIntensBlind   

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

    r6772 r6828  
    402402        MHCalibrationPix &pix = (*this)[i];       
    403403        h = pix.GetHGausHist();
    404         h->SetName (Form("%s%s%s%4i","H",fHistName.Data(),"HiGainPix",i));
    405         h->SetTitle(Form("%s%s%4i%s",fHistTitle.Data()," High Gain Pixel ",i," Runs: ")); 
     404        h->SetName (Form("%s%s%s%04d","H",fHistName.Data(),"HiGainPix",i));
     405        h->SetTitle(Form("%s%s%04d%s",fHistTitle.Data()," High Gain Pixel ",i," Runs: ")); 
    406406        h->SetXTitle(fHistXTitle.Data());
    407407        h->SetYTitle(fHistYTitle.Data());
    … …  
    431431            MHCalibrationPix &pix = GetAverageHiGainSector(j);       
    432432            h = pix.GetHGausHist();
    433             h->SetName (Form("%s%s%s%2i","H",fHistName.Data(),"HiGainSector",j));
    434             h->SetTitle(Form("%s%s%2i%s",fHistTitle.Data(),
     433            h->SetName (Form("%s%s%s%02d","H",fHistName.Data(),"HiGainSector",j));
     434            h->SetTitle(Form("%s%s%02d%s",fHistTitle.Data(),
    435435                             " averaged on event-by-event basis High Gain Sector ",j," Runs: "));
    436436            h->SetXTitle(fHistXTitle.Data());
    … …  
    447447        MHCalibrationPix &pix = (*this)(i);       
    448448        h = pix.GetHGausHist();
    449         h->SetName (Form("%s%s%s%4i","H",fHistName.Data(),"LoGainPix",i));
    450         h->SetTitle(Form("%s%s%4i%s",fHistTitle.Data()," Low Gain Pixel ",i," Runs: ")); 
     449        h->SetName (Form("%s%s%s%04d","H",fHistName.Data(),"LoGainPix",i));
     450        h->SetTitle(Form("%s%s%04d%s",fHistTitle.Data()," Low Gain Pixel ",i," Runs: ")); 
    451451        h->SetXTitle(fHistXTitle.Data());
    452452        h->SetYTitle(fHistYTitle.Data());
    … …  
    476476            MHCalibrationPix &pix = GetAverageLoGainSector(j);       
    477477            h = pix.GetHGausHist();
    478             h->SetName (Form("%s%s%s%2i","H",fHistName.Data(),"LoGainSector",j));
    479             h->SetTitle(Form("%s%s%2i%s",fHistTitle.Data(),
     478            h->SetName (Form("%s%s%s%02d","H",fHistName.Data(),"LoGainSector",j));
     479            h->SetTitle(Form("%s%s%02d%s",fHistTitle.Data(),
    480480                             " averaged on event-by-event basis Low Gain Sector ",j," Runs: "));
    481481            h->SetXTitle(fHistXTitle.Data());
    … …  
    633633    {
    634634      TH1F *h = (*this)[i].GetHGausHist();
    635       h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
     635      h->SetTitle( Form("%s%08d ", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]));
    636636    }
    637637
    … …  
    640640      {
    641641        TH1F *h = (*this)(i).GetHGausHist();
    642         h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
     642        h->SetTitle( Form("%s%08d ", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]));
    643643      }
    644644 
    … …  
    649649    {
    650650      TH1F *h = GetAverageHiGainArea(j).GetHGausHist();
    651       h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
     651      h->SetTitle( Form("%s%08d ", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]));
    652652    }
    653653 
    … …  
    656656      {
    657657        TH1F *h = GetAverageLoGainArea(j).GetHGausHist();
    658         h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
     658        h->SetTitle( Form("%s%08d ", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]));
    659659      }
    660660 
    … …  
    662662    {
    663663      TH1F *h = GetAverageHiGainSector(j).GetHGausHist();
    664       h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
     664      h->SetTitle( Form("%s%08d ", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]));
    665665    }
    666666 
    … …  
    669669      {
    670670        TH1F *h = GetAverageLoGainSector(j).GetHGausHist();
    671         h->SetTitle( Form("%s%i%s", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]," "));
     671        h->SetTitle( Form("%s%08d ", h->GetTitle(),fRunNumbers[fRunNumbers.GetSize()-1]));
    672672      }
    673673 

  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r6821 r6828  
    122122// - fIsRelTimesUpdate to kFALSE
    123123// - fIsHiLoCalibration to kFALSE
    124 // - fIsModifiedExtractWin to kTRUE
    125124// - fPulsePosCheck to kTRUE
    126125//
    127126MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
    128     : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE),
    129       fIsModifiedExtractWin(kTRUE)
     127    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE)
    130128{
    131129    fName  = name  ? name  : "MJCalibrateSignal";
    … …  
    272270Bool_t MJCalibrateSignal::CheckEnvLocal()
    273271{
    274 
    275272    SetInterlaced(GetEnv("Interlaced", fIsInterlaced));
    276273    SetRelTimesUpdate(GetEnv("RelTimesUpdate", fIsRelTimesUpdate));
    277     SetModifiedExtractWin(GetEnv("ModifiedExtractWin", fIsModifiedExtractWin));
    278274
    279275    return MJCalib::CheckEnvLocal();

  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

    r6821 r6828  
    2222    MExtractor *fExtractor;
    2323
    24   //    MRunIter *fCruns;                   // Calibration run iter
    2524    Bool_t fIsInterlaced;               // Distinguish interlaced from other calibration
    2625    Bool_t fIsRelTimesUpdate;           // Choose to update relative times from interlaced
    27     Bool_t fIsModifiedExtractWin;       // Choose to use the modified extraction window from pulse position
    2826   
    2927    Bool_t CheckEnvLocal();
    … …  
    4846    void SetInterlaced     ( const Bool_t b=kTRUE )  { fIsInterlaced      = b; }
    4947    void SetRelTimesUpdate ( const Bool_t b=kTRUE )  { fIsRelTimesUpdate  = b; }
    50     void SetModifiedExtractWin( const Bool_t b=kTRUE )  { fIsModifiedExtractWin = b; }
    51 
    52     //    void SetInputCal    ( MRunIter *iter       )  { fCruns = iter; }
    5348
    5449    void SetExtractor(const MExtractor &ext);

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r6820 r6828  
    197197  fTitle = title ? title : "Tool to create the calibration constants for one calibration run";
    198198 
    199   SetUseBlindPixel();
    200   SetUsePINDiode();
     199  SetUseBlindPixel(kFALSE);
     200  SetUsePINDiode(kFALSE);
    201201 
    202202  SetHiLoCalibration();
    … …  
    15271527      cpix.SetConversionHiLoErr(sigma);     
    15281528    }
     1529
    15291530  return kTRUE;
    15301531}
    … …  
    17941795    MHCalibrationChargeBlindCam blindcam;
    17951796    plist.AddToList(&chargecam);
    1796     plist.AddToList(&blindcam);
     1797
     1798    if (IsUseBlindPixel())
     1799      plist.AddToList(&blindcam);
    17971800    if (IsRelTimes())
    1798         plist.AddToList(&reltimecam);
     1801      plist.AddToList(&reltimecam);
    17991802    //
    18001803    // Data Reading tasks
    … …  
    19071910
    19081911    tlist.AddToList(&taskenv);
    1909     tlist.AddToList(&pinext);
    1910     tlist.AddToList(&blindext);
     1912   
     1913    if (IsUsePINDiode())
     1914      tlist.AddToList(&pinext);
     1915    if (IsUseBlindPixel())
     1916      tlist.AddToList(&blindext);
    19111917
    19121918    MTaskEnv taskenv2("ExtractTime");

  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.h

    r6743 r6828  
    4141  Float_t fRiseTimeHiGain;              // The usual rise time of the pulse in the high-gain
    4242  Float_t fFallTimeHiGain;              // The usual fall time of the pulse in the high-gain
    43   Float_t fRiseTimeLoGain;              //! The usual rise time of the pulse in the low-gain
    44   Float_t fFallTimeLoGain;              //! The usual fall time of the pulse in the low-gain
     43  Float_t fRiseTimeLoGain;              // The usual rise time of the pulse in the low-gain
     44  Float_t fFallTimeLoGain;              // The usual fall time of the pulse in the low-gain
    4545
    4646  Float_t fLoGainStretch;               // The stretch of the low-gain w.r.t. the high-gain pulse
    4747
    48   Int_t   fRandomIter;                  // Counter used to randomize weights for noise calculation
     48  Int_t   fRandomIter;                  //! Counter used to randomize weights for noise calculation
    4949 
    5050  Int_t   ReadEnv(const TEnv &env, TString prefix, Bool_t print);
    … …  
    100100                               Byte_t &sat, const MPedestalPix &ped, const Bool_t abflag);
    101101
    102   ClassDef(MExtractTimeAndChargeSpline, 3)   // Task to Extract Arrival Times and Charges using a Fast Cubic Spline
     102  ClassDef(MExtractTimeAndChargeSpline, 4)   // Task to Extract Arrival Times and Charges using a Cubic Spline
    103103};
    104104
Note: See TracChangeset for help on using the changeset viewer.