Ignore:
Timestamp:
05/21/04 17:28:02 (21 years ago)
Author:
rico
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mtemp/mifae/library
Files:
4 added
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mtemp/mifae/library/IFAELinkDef.h

    r4072 r4117  
    55#pragma link off all functions;
    66
    7 #pragma link C++ class MDCA+;
     7#pragma link C++ class MDisplay+;
     8#pragma link C++ class MHillasDisplay+;
    89#pragma link C++ class MPSFFit+;
    910#pragma link C++ class MPSFFitCalc+;

  • trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcPlace.cc

    r4094 r4117  
    3939//  Output Containers:
    4040//    MSrcPosCam
    41 //    MDCA
    4241//
    4342//////////////////////////////////////////////////////////////////////////////
    … …  
    5150#include "MSrcPlace.h"
    5251#include "MSrcPosCam.h"
    53 #include "MDCA.h"
    5452
    5553#include "MLog.h"
    … …  
    6765// Default constructor. The first argument is the name of the internal histo,
    6866// the second (third) argument is the name of the input (output) container
    69 // containing the source position in the camera plain. Fourth argument is the
    70 // name of the output MDCA container.
    71 //
    72 MSrcPlace::MSrcPlace(const char* srcPosIn, const char* srcPosOut, const char* dca, const char *name, const char *title)
    73   : fSrcPosIn(NULL), fSrcPosOut(NULL), fDCA(NULL), fHistoName("SrcPosHist"),
     67// containing the source position in the camera plain.
     68//
     69MSrcPlace::MSrcPlace(const char* srcPosIn, const char* srcPosOut,  const char *name, const char *title)
     70  : fSrcPosIn(NULL), fSrcPosOut(NULL), fHistoName("SrcPosHist"),
    7471    fHistoBinPrec(1.), fHistPos(NULL)
    7572{
    … …  
    7976    fSrcPosInName   = srcPosIn;
    8077    fSrcPosOutName  = srcPosOut;
    81     fDCAName        = dca;
    8278
    8379    fMode=kOn;
    … …  
    116112      fHistPos->GetRandom2(x,y);
    117113      fSrcPosOut->SetXY(x,y);
    118       fDCA->SetRefPoint(x,y);
    119114    }
    120115}
    … …  
    153148      fSrcPosOut = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam", AddSerialNumber(fSrcPosOutName));
    154149      if(!fSrcPosOut)
    155         return kFALSE;
    156     }
    157 
    158   // look for/create MDCA
    159   fDCA = (MDCA*)pList->FindObject(AddSerialNumber(fDCAName), "MDCA");
    160   if (!fDCA)
    161     {
    162       *fLog << warn << AddSerialNumber(fDCAName) << " [MDCA] not found... creating default container." << endl;
    163       fDCA = (MDCA*)pList->FindCreateObj("MDCA", AddSerialNumber(fDCAName));
    164       if(!fDCA)
    165150        return kFALSE;
    166151    }

  • trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcPlace.h

    r4094 r4117  
    66#endif
    77
    8 class MDCA;
    98class MSrcPosCam;
    109class TH2F;
    … …  
    1817  MSrcPosCam*  fSrcPosIn;       //  Pointer to the input source position container
    1918  MSrcPosCam*  fSrcPosOut;      //  Pointer to the output source position container
    20   MDCA*        fDCA;            //  Pointer to the output MDCA container
    2119 
    2220  TString      fSrcPosInName;   //  Name of the input MSrcPosCam object
    2321  TString      fSrcPosOutName;  //  Name of the output MSrcPosCam object
    24   TString      fDCAName;        //  Name of the MDCA object
    2522
    2623  TString      fHistoName;      //  Name of internal histogram
    … …  
    4239 public:
    4340  MSrcPlace(const char* srcin="MSrcPosCam",const char* srcout="MSrcPosCam",
    44             const char* dcaout="MDCA",
    4541            const char* name=NULL, const char* title=NULL);
    4642
    … …  
    5046  void SetInputSrcPosName(TString name)     {fSrcPosInName=name;}
    5147  void SetOutputSrcPosName(TString name)    {fSrcPosOutName=name;}
    52   void SetDCAName(TString name)             {fDCAName=name;}
    5348  void SetInternalHistoName(TString name)   {fHistoName=name;}
    5449  void SetInternalHistoBinSize(Float_t size){fHistoBinPrec=size;}
    … …  
    5954  MSrcPosCam*   GetInputSrcPosCam()    {return fSrcPosIn;}
    6055  MSrcPosCam*   GetOutputSrcPosCam()   {return fSrcPosOut;}
    61   MDCA*         GetDCA()               {return fDCA;}
    6256  TString       GetInternalHistoName() {return fHistoName;}
    6357 

  • trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcPosFromFile.cc

    r4094 r4117  
    4242#include "MRawRunHeader.h"
    4343#include "MSrcPosCam.h"
    44 #include "MDCA.h"
    4544
    4645#include "MLog.h"
    … …  
    156155
    157156  GetOutputSrcPosCam()->SetXY(fLastValidSrcPosCam->GetX(),fLastValidSrcPosCam->GetY());
    158   GetDCA()->SetRefPoint(fLastValidSrcPosCam->GetX(),fLastValidSrcPosCam->GetY());
    159157
    160158  return kTRUE;

  • trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcRotate.cc

    r4094 r4117  
    3333//  Output Containers:
    3434//    MSrcPosCam
    35 //    MDCA
    3635//
    3736//////////////////////////////////////////////////////////////////////////////
    … …  
    4847#include "MObservatory.h"
    4948#include "MSrcPosCam.h"
    50 #include "MDCA.h"
    5149
    5250#include "MLog.h"
    … …  
    6664// camera plain
    6765//
    68 MSrcRotate::MSrcRotate(const char* srcPosIn, const char* srcPosOut, const char* dca, const char *name, const char *title)
     66MSrcRotate::MSrcRotate(const char* srcPosIn, const char* srcPosOut, const char *name, const char *title)
    6967  : fRA(0), fDEC(0), fRefMJD(0), fRunNumber(0)
    7068{
    … …  
    7472    SetInputSrcPosName(srcPosIn);
    7573    SetOutputSrcPosName(srcPosOut);
    76     SetDCAName(dca);
    7774
    7875    SetInternalHistoName(TString(fName)+"Hist");
    … …  
    181178  MSrcPosCam* srcposIn  = GetInputSrcPosCam();
    182179  MSrcPosCam* srcposOut = GetOutputSrcPosCam();
    183   MDCA* dca = GetDCA();
    184180 
    185181  Float_t c = TMath::Cos(rotationAngle);
    … …  
    196192 
    197193  srcposOut->SetXY(newX,newY);
    198   dca->SetRefPoint(newX,newY);
    199194
    200195  return kTRUE;

  • trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcRotate.h

    r4094 r4117  
    3232 public:
    3333  MSrcRotate(const char* srcIn="MSrcPosCam",const char* srcOut="MSrcPosCam",
    34              const char* dca="MDCA",
    3534             const char* name=NULL, const char* title=NULL);
    3635 

  • trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcTranslate.cc

    r4094 r4117  
    3636//  Output Containers:
    3737//    MSrcPosCam
    38 //    MDCA
    3938//
    4039//////////////////////////////////////////////////////////////////////////////
    … …  
    4746#include "MSrcTranslate.h"
    4847#include "MSrcPosCam.h"
    49 #include "MDCA.h"
    5048
    5149#include "MLog.h"
    … …  
    6563// camera plain
    6664//
    67 MSrcTranslate::MSrcTranslate(const char* srcPosIn, const char* srcPosOut, const char* dca, const char *name, const char *title)
     65MSrcTranslate::MSrcTranslate(const char* srcPosIn, const char* srcPosOut, const char *name, const char *title)
    6866  : fShiftX(0.), fShiftY(0.), fTranslationIsRelative(kTRUE)
    6967{
    … …  
    7371    SetInputSrcPosName(srcPosIn);
    7472    SetOutputSrcPosName(srcPosOut);
    75     SetDCAName(dca);
    7673
    7774    SetInternalHistoName(TString(fName)+"Hist");
    … …  
    8481Int_t MSrcTranslate::PreProcess(MParList *pList)
    8582{
    86   // look for/create MSrcPosCam and DCA
     83  // look for/create MSrcPosCam
    8784  if(!MSrcPlace::PreProcess(pList))
    8885    return kFALSE;
    … …  
    103100
    104101  MSrcPosCam* srcPosOut = GetOutputSrcPosCam();
    105   MDCA*       dca       = GetDCA();
    106102 
    107103  if(fTranslationIsRelative)
    … …  
    118114
    119115  srcPosOut->SetXY(newX,newY);
    120   dca->SetRefPoint(newX,newY);
    121116
    122117  return kTRUE;

  • trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcTranslate.h

    r4094 r4117  
    1818 public:
    1919  MSrcTranslate(const char* srcIn="MSrcPosCam", const char* srcOut="MSrcPosCam",
    20                 const char* dca="MDCA",
    2120                const char* name=NULL, const char* title=NULL);
    2221 

  • trunk/MagicSoft/Mars/mtemp/mifae/library/Makefile

    r4072 r4117  
    4848
    4949SRCFILES = \
    50         MDCA.cc \
     50        MDisplay.cc \
     51        MHillasDisplay.cc \
    5152        MPSFFit.cc \
    5253        MPSFFitCalc.cc \
Note: See TracChangeset for help on using the changeset viewer.