Changeset 4587 for trunk/MagicSoft


Ignore:
Timestamp:
08/12/04 09:16:13 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Cosy/Changelog

    r4549 r4587  
    11                                                                  -*-*- END -*-*-
     2
     3 2004/08/12 - Thomas Bretz
     4
     5   * tpoint/gui.C:
     6     - implemented TGFSFileDialog for reading the star data
     7
     8
    29
    310 2004/08/05 - Thomas Bretz

  • trunk/MagicSoft/Cosy/tpoint/gui.C

    r4357 r4587  
    1010#include <TGLabel.h>
    1111#include <TGButton.h>
     12#include <TGFileDialog.h>
    1213
    1314#include <TF1.h>
    … …  
    749750    }
    750751
    751     void LoadStars()
     752    void LoadStars(TString fname="tpoint.txt")
    752753    {
    753754        const Int_t size = fOriginal.GetSize();
    754755
    755         ifstream fin("tpoint.txt");
     756        ifstream fin(fname);
    756757
    757758        while (fin && fin.get()!='\n');
    … …  
    760761        if (!fin)
    761762        {
    762             cout << "File 'tpoint.txt' not found!" << endl;
     763            cout << "File '" << fname << "' not found!" << endl;
    763764            return;
    764765        }
    … …  
    777778        cout << "Found " << fOriginal.GetSize()-size << " sets of coordinates ";
    778779        cout << "(Total=" << fOriginal.GetSize() << ")" << endl;
     780    }
     781
     782    // --------------------------------------------------------------------------
     783    //
     784    //  Opens an open dialog
     785    //
     786    TString OpenDialog()
     787    {
     788        static const char *gOpenTypes[] =
     789        {
     790            "TPoint files", "*.txt",
     791            "All files",    "*",
     792            NULL,           NULL
     793        };
     794
     795        static TString dir(".");
     796
     797        TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo
     798
     799        fi.fFileTypes = (const char**)gOpenTypes;
     800        fi.fIniDir    = StrDup(dir);
     801
     802        new TGFileDialog(fClient->GetRoot(), this, kFDOpen, &fi);
     803
     804        if (!fi.fFilename)
     805            return 0;
     806
     807        dir = fi.fIniDir;
     808
     809        return fi.fFilename;
    779810    }
    780811
    … …  
    809840                    return kTRUE;
    810841                case kTbLoadStars:
    811                     LoadStars();
     842                    LoadStars(OpenDialog());
    812843                    DisplayData();
    813844                    return kTRUE;

  • trunk/MagicSoft/Mars/Changelog

    r4586 r4587  
    2020                                                 -*-*- END OF LINE -*-*-
    2121
    22     2004/08/12: Hendrik Bartko
    23     * msignal/MExtractor.[h,cc]:
    24       - add SetNamePedContainer to set the name of the pedestal
    25         container
    26 
    27     * msignal/MExtractTime.[h,cc]:
    28       - add SetNamePedContainer to set the name of the pedestal
    29         container
    30 
    31     * mbadpixels/MBadPixelsCalc.[h,cc]
    32       - add SetNamePedPhotContainer to set the name of the pedphot
    33         container
    34 
    35     * mbadpixels/MBadPixelsTreat.[h,cc]
    36       - add SetNamePedPhotContainer to set the name of the pedphot
    37         container
    38 
    39     * mimage/MImgCleanStd.[h,cc]
    40       - add SetNamePedPhotContainer to set the name of the pedphot
    41         container
     22  2004/08/12: Thomas Bretz
     23
     24   * mreport/MReportFileReadCC.cc:
     25     - fixed a bug in CheckFileHeader which caused a condition to
     26       be wrongly evaluated
     27
     28
     29
     30  2004/08/12: Hendrik Bartko
     31
     32   * msignal/MExtractor.[h,cc]:
     33     - add SetNamePedContainer to set the name of the pedestal
     34       container
     35
     36   * msignal/MExtractTime.[h,cc]:
     37     - add SetNamePedContainer to set the name of the pedestal
     38       container
     39
     40   * mbadpixels/MBadPixelsCalc.[h,cc]
     41     - add SetNamePedPhotContainer to set the name of the pedphot
     42       container
     43
     44   * mbadpixels/MBadPixelsTreat.[h,cc]
     45     - add SetNamePedPhotContainer to set the name of the pedphot
     46       container
     47
     48   * mimage/MImgCleanStd.[h,cc]
     49     - add SetNamePedPhotContainer to set the name of the pedphot
     50       container
     51
    4252
    4353
    4454  2004/08/12 : Wolfgang Wittek
    4555
    46     * manalysis/MSourcPosFromStarPos.[h,cc]
    47       - replace MMcEvt by MPointingPos
    48 
    49     * manalysis/MSigmabarCalc.[h,cc]
    50       - replace MMcEvt by MPointingPos
    51 
    52     * manalysis/MSigmabar.[h,cc]
    53       - in member function Calc() return fSigmabarInner,
    54         not fSigmabar
    55       - update comments
    56       - sigmabar is the sqrt of the average (pedRMS^2/area)
    57 
    58     * manalysis/MPad.[h,cc]
    59       - replace MMcEvt by MPointingPos
    60       - remove bugs
    61 
    62     * mfilter/MFSelBasic.[h,cc]
    63       - replace MMcEvt by MPointingPos
    64 
    65     * mfilter/Makefile
    66       - add -I../mpointing
    67 
    68 
    69     * mhist/MHSigmaTheta.[h,cc]
    70       - replace MMcEvt by MPointingPos     
    71       - replace 'MCerPhotPix cerpix' by 'MCerPhotPix &cerpix'
    72       - add plot "Sigmabar(Outer) versus Theta"
    73 
    74     * macros/ONOFFAnalysis.C
    75       - Job A : got the padding working, work in progress
    76 
    77 
    78   2004/08/11: Hendrik Bartko
    79   * mcalib/MCalibrateData.[h,cc]:
    80     - add SetPedestalType to choose whether to calibrate the pedestal
    81       for each run or each event
    82     - add EnablePedestalType to enable to calibrate the pedestal for
    83       each run or each event
    84     - add DisablePedestalType to disable to calibrate the pedestal for
    85       each run or each event
    86     - add TestFlag test whether to do the run and / or event pedestal
    87       calculation
    88     - add SetNamePedADCRunContainer to change name of pedestal input
    89       container for run pedestals
    90     - add SetNamePedADCEventContainer to change name of pedestal input
    91       container for event pedestals
    92     - add SetNamePedPhotRunContainer to change name of pedestal output
    93       container for run pedestals
    94     - add SetNamePedPhotEventContainer to change name of pedestal output
    95       container for run pedestals
    96     - add CalibratePedestal, function to calibrate the chosen pedestal
    97     - added the calibration types kFlatCharge, kDummy as in MCalibrate
    98 
     56   * manalysis/MSourcPosFromStarPos.[h,cc]
     57     - replace MMcEvt by MPointingPos
     58
     59   * manalysis/MSigmabarCalc.[h,cc]
     60     - replace MMcEvt by MPointingPos
     61
     62   * manalysis/MSigmabar.[h,cc]
     63     - in member function Calc() return fSigmabarInner,
     64       not fSigmabar
     65     - update comments
     66     - sigmabar is the sqrt of the average (pedRMS^2/area)
     67
     68   * manalysis/MPad.[h,cc]
     69     - replace MMcEvt by MPointingPos
     70     - remove bugs
     71
     72   * mfilter/MFSelBasic.[h,cc]
     73     - replace MMcEvt by MPointingPos
     74
     75   * mfilter/Makefile
     76     - add -I../mpointing
     77
     78   * mhist/MHSigmaTheta.[h,cc]
     79     - replace MMcEvt by MPointingPos     
     80     - replace 'MCerPhotPix cerpix' by 'MCerPhotPix &cerpix'
     81     - add plot "Sigmabar(Outer) versus Theta"
     82
     83   * macros/ONOFFAnalysis.C
     84     - Job A : got the padding working, work in progress
     85
     86
     87
     88 2004/08/11: Hendrik Bartko
     89
     90   * mcalib/MCalibrateData.[h,cc]:
     91     - add SetPedestalType to choose whether to calibrate the pedestal
     92       for each run or each event
     93     - add EnablePedestalType to enable to calibrate the pedestal for
     94       each run or each event
     95     - add DisablePedestalType to disable to calibrate the pedestal for
     96       each run or each event
     97     - add TestFlag test whether to do the run and / or event pedestal
     98       calculation
     99     - add SetNamePedADCRunContainer to change name of pedestal input
     100       container for run pedestals
     101     - add SetNamePedADCEventContainer to change name of pedestal input
     102       container for event pedestals
     103     - add SetNamePedPhotRunContainer to change name of pedestal output
     104       container for run pedestals
     105     - add SetNamePedPhotEventContainer to change name of pedestal output
     106       container for run pedestals
     107     - add CalibratePedestal, function to calibrate the chosen pedestal
     108     - added the calibration types kFlatCharge, kDummy as in MCalibrate
    99109
    100110   * mbadpixels/MBadPixelsCalc.cc:
    … …  
    105115
    106116
    107   2004/08/10: Thomas Bretz
     117 2004/08/10: Thomas Bretz
    108118
    109119   * mreport/MReportFileReadCC.[h,cc]:
    … …  
    156166
    157167
    158   2004/08/10: Robert Wagner
     168 2004/08/10: Robert Wagner
    159169
    160170   * mreport/MReportCamera.[h,cc]
    … …  
    166176
    167177
    168   2004/08/10: Markus Gaug
     178 2004/08/10: Markus Gaug
    169179
    170180   * mcalib/MCalibrationTestCalc.[h,cc]
    … …  
    182192
    183193
    184   2004/08/10: Florian Goebel
     194 2004/08/10: Florian Goebel
    185195
    186196   * mpedestal/MPedCalcFromLoGain.[h,cc]
    … …  
    194204
    195205
    196   2004/08/10: Nadia Tonello
     206 2004/08/10: Nadia Tonello
    197207
    198208   * mbadpixels/MBadPixelsTreat.[h,cc]

  • trunk/MagicSoft/Mars/mreport/MReportFileReadCC.cc

    r4575 r4587  
    9191
    9292    // report file matching a single run
    93     if (str(TRegexp("^[CC Run [0-9]+ Control File]$")).IsNull())
     93    if (!str(TRegexp("^[CC Run [0-9]+ Control File]$")).IsNull())
    9494        run = atoi(str(TRegexp(" [0-9]+")).Data());
    9595
Note: See TracChangeset for help on using the changeset viewer.