diff --git a/examples/generate_prod3_irfs.py b/examples/generate_prod3_irfs.py
index 15c6d5f..f68f0e3 100755
--- a/examples/generate_prod3_irfs.py
+++ b/examples/generate_prod3_irfs.py
@@ -83,6 +83,8 @@ def generate_prod3_irfs():
         caldb['id']            = entry['id']
         caldb['version']       = entry['inst']
         caldb['analysis']      = entry.setdefault('analysis', 'DESY')
+        caldb['zenith']        = entry.setdefault('zenith', 20.0)
+        caldb['azimuth']       = entry.setdefault('azimuth', 0.0)
         caldb['psftype']       = entry.setdefault('psftype', 'Gauss')
         caldb['norm1d']        = entry.setdefault('norm1d', False)
         caldb['rebin']         = entry.setdefault('rebin', False)
diff --git a/examples/make_pointings.py b/examples/make_pointings.py
index 0508748..7fbb8e4 100755
--- a/examples/make_pointings.py
+++ b/examples/make_pointings.py
@@ -246,7 +246,6 @@ def set_irf(site, obs, caldb, lst=True):
 
         # Compute best possible zenith angle
         zenith = abs(dec - geolat)
-        print(dec, zenith)
 
         # Set IRF
         if site == 'North':
@@ -442,7 +441,7 @@ def set_lmc(hours=250.0, caldb='prod2', lst=True):
         obs = {'lon': lon, 'lat': lat, 'duration': duration}
 
         # Set IRF
-        irf = set_irf(obs_site, obs, caldb, lst=lst)
+        irf = set_irf('South', obs, caldb, lst=lst)
 
         # Add IRF
         obs['caldb'] = caldb
diff --git a/test/test_csroot2caldb.py b/test/test_csroot2caldb.py
index a2123c8..28bccf6 100644
--- a/test/test_csroot2caldb.py
+++ b/test/test_csroot2caldb.py
@@ -79,7 +79,7 @@ class Test(test):
         cmd = csroot2caldb+' infile="'+self._infile+'"'+ \
                            ' outdir="csroot2caldb_cmd1"'+ \
                            ' inst=prod3 id=South_50h version=prod3'+ \
-                           ' analysis=DESY'+ \
+                           ' analysis=DESY zenith=20.0 azimuth=0.0'+ \
                            ' logfile="csroot2caldb_cmd1.log" chatter=2'
 
         # Check if execution of wrong command fails
@@ -107,6 +107,8 @@ class Test(test):
         caldb['id']            = 'South_50h'
         caldb['version']       = 'prod3'
         caldb['analysis']      = 'DESY'
+        caldb['zenith']        = 20.0
+        caldb['azimuth']       = 0.0
         caldb['psftype']       = 'King'
         caldb['norm1d']        = True
         caldb['rebin']         = True