Changeset 4578

Timestamp:

08/11/04 13:42:50 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• merpp.cc (modified) (5 diffs)
• mimage/MHillasCalc.cc (modified) (5 diffs)
• mimage/MHillasCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -34 +34 @@
      - added new commandline options to support different CC files
      - changed help-output
+     - temporarily removed SQL option
 
    * readraw.cc:
@@ -64 +65 @@
    * msql/MSQLServer.[h,cc]:
      - small changes to interface
+
+   * mimage/MHillasCalc.[h,cc]:
+     - changed names of TString data members
 
 

trunk/MagicSoft/Mars/merpp.cc

@@ -60 +60 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << "   merpp [-h] [-?] [-a] [-vn] [-cn] [-u, -f]" << endl;
-    gLog << "         inputfile[.rep,[.raw],[.txt]] [outputfile[.root]]" << endl << endl;
-    gLog << "     inputfile.raw:  Magic DAQ binary file." << endl;
-    gLog << "     inputfile.rep:  Magic Central Control report file." << endl;
-    gLog << "     inputfile.txt:  Magic DC currents file." << endl;
-    gLog << "     ouputfile.root: Merpped root file." << endl;
-    gLog << "     -c#                              Compression level #=1..9 [default=2]" << endl;
-    gLog << "     -v#                              Verbosity level # [default=2]" << endl;
-    gLog << "     -u, --update                     Update file" << endl;
-    gLog << "     -a, --no-colors                  Do not use Ansii color codes" << endl;
-    gLog << "     -f                               Force overwrite of an existing file" << endl;
-    gLog << "     -ff                              Force merpp to ignore broken events <raw data only>" << endl;
-    gLog << "     --interleave=#                   Process only each i-th event [default=1]  <raw data only>" << endl;
-    gLog << "     --sql=mysql://user:password@url  Insert run into database <raw data only>" << endl;
-    gLog << "     --start=yyyy-mm-dd/hh:mm:ss.mmm  Start event time for merpping report files" << endl;
-    gLog << "     --stop=yyyy-mm-dd/hh:mm:ss.mmm   Stop  event time for merpping report files" << endl;
-    gLog << "     --run=#                          Only data corresponding to this run number (from RUN-REPORT)" << endl;
-    gLog << "     --runfile=#                      Check that CC file corresponds to this run (from .rep header)" << endl;
-    gLog << "     --sumfile                        Check that CC file is a all night summary (from .rep header)" << endl;
-    gLog << "     --allfiles                       Don't check file type for CC files <default>" << endl;
-    gLog << "     --debug[=n]                      Enable root debugging (Default: gDebug=1)" << endl;
-    gLog << "     -?, -h, --help                   This help" << endl << endl;
-    gLog << "   REMARK: At the moment you can process a .raw _or_ a .rep file, only!" << endl << endl;
+    gLog << " merpp [-h] [-?] [-a] [-vn] [-cn] [-u, -f]" << endl;
+    gLog << "       inputfile[.rep,[.raw],[.txt]] [outputfile[.root]]" << endl << endl;
+    gLog << " Arguments:" << endl;
+    gLog << "   inputfile.raw:  Magic DAQ binary file." << endl;
+    gLog << "   inputfile.rep:  Magic Central Control report file." << endl;
+    gLog << "   inputfile.txt:  Magic DC currents file." << endl;
+    gLog << "   ouputfile.root: Merpped root file." << endl << endl;
+    gLog << " Options:" << endl;
+    gLog << "   -c#                Compression level #=1..9 [default=2]" << endl;
+    gLog << "   -v#                Verbosity level # [default=2]" << endl;
+    gLog << "   -u, --update       Update file" << endl;
+    gLog << "   -a, --no-colors    Do not use Ansii color codes" << endl;
+    gLog << "   -f                 Force overwrite of an existing file" << endl;
+    gLog << "   --debug[=n]        Enable root debugging (Default: gDebug=1)" << endl;
+    gLog << "   -?, -h, --help     This help" << endl << endl;
+    gLog << " Raw Data Options:" << endl;
+    gLog << "   -ff                Force merpp to ignore broken events" << endl;
+    gLog << "   --interleave=#     Process only each i-th event [default=1]" << endl << endl;
+//    gLog << "   --sql=mysql://user:password@url  Insert run into database" << endl << endl;
+    gLog << " Report File Options:" << endl;
+    gLog << "   --start=date/time  Start event time" << endl;
+    gLog << "   --stop=date/time   Stop  event time" << endl;
+    gLog << "   --run=#            Only data corresponding to this run number" << endl;
+    gLog << "                      (from RUN-REPORT)" << endl;
+    gLog << "   --runfile=#        Allow only run-control files" << endl;
+    gLog << "                      (from .rep header)" << endl;
+    gLog << "   --sumfile          Check for an all night summary file" << endl;
+    gLog << "                      (from .rep header)" << endl;
+    gLog << "   --allfiles         Don't check file type <default>" << endl << endl;
+    gLog << " REMARK: - At the moment you can process a .raw _or_ a .rep file, only!" << endl;
+    gLog << "         - 'date/time' has the format 'yyyy-mm-dd/hh:mm:ss.mmm'" << endl << endl;
 }
 
@@ -134 +142 @@
 
     const Int_t   kRunNumber   = arg.HasOption("--run=") ? arg.GetIntAndRemove("--run=") : -1;
-    const TString kSqlDataBase(arg.GetStringAndRemove("--sql="));
+//    const TString kSqlDataBase(arg.GetStringAndRemove("--sql="));
 
     Int_t kRunFile = arg.HasOption("--runfile=") ? arg.GetIntAndRemove("--runfile=") : -1;
@@ -180 +188 @@
         kNameout += ".root";
 
-    if (!kSqlDataBase.IsNull() && !israw)
-        gLog << warn << "WARNING - Option '--sql=' only valid for raw-files... ignored." << endl;
+//    if (!kSqlDataBase.IsNull() && !israw)
+//        gLog << warn << "WARNING - Option '--sql=' only valid for raw-files... ignored." << endl;
 
     //
@@ -326 +334 @@
     if (filter)
         tasks.AddToList(filter);
+    /*
     if (israw && !kSqlDataBase.IsNull())
     {
@@ -331 +340 @@
         ins->SetUpdate();
         tasks.AddToList(ins);
-    }
+    }*/
     tasks.AddToList(write);
 

trunk/MagicSoft/Mars/mimage/MHillasCalc.cc

@@ -80 +80 @@
 //
 MHillasCalc::MHillasCalc(const char *name, const char *title)
-    : fHilName("MHillas"), fHilExtName("MHillasExt"),
-    fImgParName("MNewImagePar"), fConcName("MConcentration"),
+    : fNameHillas("MHillas"), fNameHillasExt("MHillasExt"),
+    fNameNewImgPar("MNewImagePar"), fNameConc("MConcentration"),
     fFlags(0xff), fErrors(5)
 {
@@ -115 +115 @@
     // depend on whether MHillas is an in- or output container
     if (TestFlag(kCalcHillas))
-        fHillas = (MHillas*)pList->FindCreateObj("MHillas", AddSerialNumber(fHilName));
+        fHillas = (MHillas*)pList->FindCreateObj("MHillas", AddSerialNumber(fNameHillas));
     else
     {
-        fHillas = (MHillas*)pList->FindObject(AddSerialNumber(fHilName), "MHillas");
-        *fLog << err << fHilName << " [MHillas] not found... aborting." << endl;
+        fHillas = (MHillas*)pList->FindObject(AddSerialNumber(fNameHillas), "MHillas");
+        *fLog << err << fNameHillas << " [MHillas] not found... aborting." << endl;
     }
     if (!fHillas)
@@ -127 +127 @@
     if (TestFlag(kCalcHillasExt))
     {
-        fHillasExt = (MHillasExt*)pList->FindCreateObj("MHillasExt", AddSerialNumber(fHilExtName));
+        fHillasExt = (MHillasExt*)pList->FindCreateObj("MHillasExt", AddSerialNumber(fNameHillasExt));
         if (!fHillasExt)
             return kFALSE;
@@ -135 +135 @@
     if (TestFlag(kCalcNewImagePar))
     {
-        fNewImgPar = (MNewImagePar*)pList->FindCreateObj("MNewImagePar", AddSerialNumber(fImgParName));
+        fNewImgPar = (MNewImagePar*)pList->FindCreateObj("MNewImagePar", AddSerialNumber(fNameNewImgPar));
         if (!fNewImgPar)
             return kFALSE;
@@ -143 +143 @@
     if (TestFlag(kCalcConc))
     {
-        fConc = (MConcentration*)pList->FindCreateObj("MConcentration", fConcName);
+        fConc = (MConcentration*)pList->FindCreateObj("MConcentration", fNameConc);
         if (!fConc)
             return kFALSE;
     }
 
-   memset(fErrors.GetArray(), 0, sizeof(Char_t)*fErrors.GetSize());
+    memset(fErrors.GetArray(), 0, sizeof(Char_t)*fErrors.GetSize());
 
     return kTRUE;

trunk/MagicSoft/Mars/mimage/MHillasCalc.h

@@ -29 +29 @@
     const MCerPhotEvt *fCerPhotEvt; //! Cerenkov Photon Event used for calculation
 
-    MHillas      *fHillas;          //! output container to store result
-    MHillasExt   *fHillasExt;       //! output container to store result
-    MNewImagePar *fNewImgPar;       //! output container to store result
-    MConcentration *fConc;          //! output container to store result
+    MHillas           *fHillas;     //! output container to store result
+    MHillasExt        *fHillasExt;  //! output container to store result
+    MNewImagePar      *fNewImgPar;  //! output container to store result
+    MConcentration    *fConc;       //! output container to store result
 
-    TString      fHilName;          // name of the 'MHillas' container
-    TString      fHilExtName;       // name of the 'MHillasExt' container
-    TString      fImgParName;       // name of the 'MNewImagePar' container
-    TString      fConcName;         // name of the 'MConcentration' container
+    TString            fNameHillas;    // name of the 'MHillas' container
+    TString            fNameHillasExt; // name of the 'MHillasExt' container
+    TString            fNameNewImgPar; // name of the 'MNewImagePar' container
+    TString            fNameConc;      // name of the 'MConcentration' container
 
-    Int_t        fFlags;            // Flags defining the behaviour of MHillasCalc
+    Int_t              fFlags;      // Flags defining the behaviour of MHillasCalc
 
-    TArrayL      fErrors;           //! Error counter. Do we have to change to Double?
+    TArrayL            fErrors;     //! Error counter. Do we have to change to Double?
 
-    void PrintSkipped(int i, const char *str) const;
+    void  PrintSkipped(int i, const char *str) const;
 
     Int_t PreProcess(MParList *pList);
@@ -60 +60 @@
     MHillasCalc(const char *name=NULL, const char *title=NULL);
 
-    void SetNameHillas(const char *name)    { fHilName = name;    }
-    void SetNameHillasExt(const char *name) { fHilExtName = name; }
-    void SetNameNewImgPar(const char *name) { fImgParName = name; }
-    void SetNameConc(const char *name) { fConcName = name; }
+    void   SetNameHillas(const char *name)    { fNameHillas = name;    }
+    void   SetNameHillasExt(const char *name) { fNameHillasExt = name; }
+    void   SetNameNewImgPar(const char *name) { fNameNewImgPar = name; }
+    void   SetNameConc(const char *name)      { fNameConc = name;      }
 
-    void SetFlags(Int_t f) { fFlags  =  f; }
-    void Enable(Int_t f)   { fFlags |=  f; }
-    void Disable(Int_t f)  { fFlags &= ~f; }
+    void   SetFlags(Int_t f) { fFlags  =  f; }
+    void   Enable(Int_t f)   { fFlags |=  f; }
+    void   Disable(Int_t f)  { fFlags &= ~f; }
     Bool_t TestFlag(CalcCont_t i) const { return fFlags&i; }