Changeset 4139 for trunk/MagicSoft/Mars/mtemp/mifae/programs

Timestamp:

05/24/04 11:26:25 (21 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae/programs

Files:

• makeHillas.cc (modified) (5 diffs)
• makehillas.datacard (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

@@ -72 +72 @@
 TString  idirname;
 TString  filter;
+TString  psfilename("makehillas.ps");
 MRunIter caliter;
 MRunIter pediter;
 MRunIter datiter;
-Bool_t   display   = kFALSE;
+UInt_t   display   = 0;
 ULong_t  nmaxevents= 999999999;
 Short_t  calflag   = 1;
@@ -302 +303 @@
   MDisplay*  disphillas=NULL;
 
-  if(!display)
-    {
-      write = new MWriteRootFile(outname,"RECREATE");
-      
-      write->AddContainer("MHillas"        , "Parameters");
-      write->AddContainer("MHillasSrc"     , "Parameters");
-      write->AddContainer("MHillasExt"     , "Parameters");
-      write->AddContainer("MNewImagePar"   , "Parameters");
-      write->AddContainer("MRawEvtHeader"  , "Parameters");
-      write->AddContainer("MRawRunHeader"  , "Parameters");
-      write->AddContainer("MConcentration" , "Parameters");
-      write->AddContainer("MSrcPosCam"     , "Parameters");
-      
-      if (islflag == 1 || islflag == 2)
-        write->AddContainer("MIslands1" , "Parameters");
-      if (islflag == 2) 
-        write->AddContainer("MIslands2" , "Parameters");
-    }
-  else
-    {
-      disphillas = new MHillasDisplay(&nphot,&geomcam);
-    }
+  write = new MWriteRootFile(outname,"RECREATE");
+  
+  write->AddContainer("MHillas"        , "Parameters");
+  write->AddContainer("MHillasSrc"     , "Parameters");
+  write->AddContainer("MHillasExt"     , "Parameters");
+  write->AddContainer("MNewImagePar"   , "Parameters");
+  write->AddContainer("MRawEvtHeader"  , "Parameters");
+  write->AddContainer("MRawRunHeader"  , "Parameters");
+  write->AddContainer("MConcentration" , "Parameters");
+  write->AddContainer("MSrcPosCam"     , "Parameters");
+  
+  if (islflag == 1 || islflag == 2)
+    write->AddContainer("MIslands1" , "Parameters");
+  if (islflag == 2) 
+    write->AddContainer("MIslands2" , "Parameters");
+
+  if(display)
+    disphillas = new MHillasDisplay(&nphot,&geomcam);
 
   tlist4.AddToList(&read4);
@@ -348 +345 @@
   tlist4.AddToList(&csrc1);
   tlist4.AddToList(&applycut);
-  if(!display)
-    tlist4.AddToList(write);
-  else
-    tlist4.AddToList(disphillas);
+  tlist4.AddToList(write);
+  if(display)
+    {
+      disphillas->SetPSFile();
+      disphillas->SetPSFileName(psfilename);
+      if(display==2) 
+        disphillas->SetPause(kFALSE);   
+      tlist4.AddToList(disphillas);
+    }
+
 
   // Create and setup the eventloop
@@ -450 +453 @@
       if(strcmp(word.Data(),"DISPLAY")==0)
         ifun >> display;
+
+      // ps file name
+      if(strcmp(word.Data(),"PSFILENAME")==0)
+        ifun >> psfilename;
 
       // calibration flag
@@ -499 +506 @@
   if(filter.Length())
     cout << "Applying rejection cut: " << filter << endl;
-  if(!display)
-    cout << "Output file name: " << outname << endl;
+  cout << "Output file name: " << outname << endl;
+  if(display)
+    cout << "Generating PS file: " << psfilename << endl;
   cout << "Calibration flag: " << calflag << endl;
   cout << "Cleaning level: ("<<lcore<<","<<ltail<<")" << endl;

trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard

@@ -21 +21 @@
 FILTER (MHillas.fLength<100) && (MHillas.fLength>50)
 
-// Display flag (DISPLAY=1 will show event display and skip saving into output file)
-DISPLAY 1
+// Display flag 
+// DISPLAY 0 will simply produce the hillas parameters files
+// DISPLAY 1 will show event display and produce ps file
+// DISPLAY 2 will produce the ps files, no display
+DISPLAY 0
+
+// PS file name
+PSFILENAME makehillas.ps
 
 // calibration flag: