Changeset 16863 for trunk/Mars

Timestamp:

06/18/13 03:50:37 (11 years ago)

Author:

Daniela Dorner

Message:

bugfix for case histogram in star does not exist, update code for nightly files

File:

• trunk/Mars/fact/processing/numevents.C (modified) (5 diffs)

trunk/Mars/fact/processing/numevents.C

@@ -21 +21 @@
 // create tables in DB
 
-int numevents(TString night="20130418", TString inpath="/daq/analysis/1/", TString table= "AnalysisResultsRunLP", Bool_t dummy=kTRUE, Bool_t pernight=kFALSE)
+int numevents(TString night="20130418", TString inpath="/daq/analysis/1/", TString table= "AnalysisResultsRunLP", Bool_t dummy=kTRUE, Bool_t pernight=kFALSE, Int_t source=0)
 {
 
@@ -105 +105 @@
             ganymed_fname=inpath+"/ganymed_run/"+year+"/"+month+"/"+day+"/"+run+"-analysis.root";
         else
-            ganymed_fname=inpath+"/ganymed_night/"+night2+"-analysis.root";
-        //cout << "gf => " << ganymed_fname << endl;
+            if (!source)
+                cout << "ERROR - source " << source << " not valid. " << endl;
+            else
+                ganymed_fname=Form("%s/ganymed_night/%d/%s-analysis.root", inpath.Data(), source, night2.Data());
+        cout << "gf => " << ganymed_fname << endl;
 
         if (!pernight)
         {
             star_fname=inpath+"/star/"+year+"/"+month+"/"+day+"/"+run+"_I.root";
-            //cout << "sf => " << star_fname << endl;
+            cout << "sf => " << star_fname << endl;
 
             //check star file status
@@ -142 +145 @@
             star_tree->Draw("MImagePar.fNumIslands>>IslandHisto","","");
             TH1F *HistJo = (TH1F*)gDirectory->Get("IslandHisto");
+            if (!HistJo)
+            {
+                cout << "ERROR - Reading of IslandHisto failed " << HistJo << endl;
+                continue;
+            }
             fNumIslandsMean = HistJo->GetMean();
         }
@@ -229 +237 @@
 
         //inserting or updating the information in the database
-        vars = Form("fRunID=%s, fNight=%s,", runid.Data(), night2.Data());
+        if (!pernight)
+            vars = Form("fRunID=%s, fNight=%s,", runid.Data(), night2.Data());
+        else
+            vars = Form("fNight=%s, fSourceKey=%d, ", night2.Data(), source);
         vars += Form(" fNumEvtsAfterQualCuts=%d, "
                     " fNumEvtsAfterBgCuts=%d, "
@@ -251 +262 @@
 
         if (pernight)
-            where = Form("fNight=%s", night2.Data());
+            where = Form("fNight=%s AND fSourceKey=%d", night2.Data(), source);
         else
             where = Form("fRunID=%s AND fNight=%s", runid.Data(), night2.Data());